btrfs: GFP_NOFS does not GFP_HIGHMEM

Masking HIGHMEM out of NOFS does not make sense.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 6cef0062f9292933435f8b6df6ff875e93a816aa..61561c2a3f96da0917a0819fb9db48972385496d 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -134,7 +134,7 @@ again:
        /* cached in the btrfs inode and can be accessed */
        atomic_add(2, &node->refs);
 
-       ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM);
+       ret = radix_tree_preload(GFP_NOFS);
        if (ret) {
                kmem_cache_free(delayed_node_cache, node);
                return ERR_PTR(ret);

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 123fab55b5a49a142ec8cf72050430d4498d2a6d..4931d3856aa3bce9127300a51f4819f1e439be1c 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1640,7 +1640,7 @@ int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info,
 {
        int ret;
 
-       ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM);
+       ret = radix_tree_preload(GFP_NOFS);
        if (ret)
                return ret;
 

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index d22b0777c7e0155d3ba54078128ea40e1a2e8fc8..d02a637530b1a6b217dc5aaa356ad042f2175385 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -4815,7 +4815,7 @@ struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,
                return NULL;
        eb->fs_info = fs_info;
 again:
-       ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM);
+       ret = radix_tree_preload(GFP_NOFS);
        if (ret)
                goto free_eb;
        spin_lock(&fs_info->buffer_lock);
@@ -4916,7 +4916,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
        if (uptodate)
                set_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags);
 again:
-       ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM);
+       ret = radix_tree_preload(GFP_NOFS);
        if (ret)
                goto free_eb;