btrfs: GFP_NOFS does not GFP_HIGHMEM

Masking HIGHMEM out of NOFS does not make sense.

Signed-off-by: David Sterba <dsterba@suse.com>
(cherry picked from commit e1860a7724828a341037b010b3f4ff58bad53f95)

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 3c1b5f31d1e02ee79bc80befe9e4e03a44b378f7..4e5cd7dde3c5a6da9524c104bba2de2a616458fc 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 30bfa268ab9edc941cb0c06298763e74e03fc30e..c7925a9f7afe88379cc7f21172fabb4e9afe926e 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1634,7 +1634,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 25fede602c6a1e1e8e47a0b34187d278128c7519..f40bf0b7ff02bf5c955160cfb8f9ad6b7ca4084c 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -4831,7 +4831,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);
@@ -4932,7 +4932,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;