Skip to content

Commit e1860a7

Browse files
committed
btrfs: GFP_NOFS does not GFP_HIGHMEM
Masking HIGHMEM out of NOFS does not make sense. Signed-off-by: David Sterba <[email protected]>
1 parent 05135f5 commit e1860a7

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

fs/btrfs/delayed-inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node(
134134
/* cached in the btrfs inode and can be accessed */
135135
atomic_add(2, &node->refs);
136136

137-
ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM);
137+
ret = radix_tree_preload(GFP_NOFS);
138138
if (ret) {
139139
kmem_cache_free(delayed_node_cache, node);
140140
return ERR_PTR(ret);

fs/btrfs/disk-io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1640,7 +1640,7 @@ int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info,
16401640
{
16411641
int ret;
16421642

1643-
ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM);
1643+
ret = radix_tree_preload(GFP_NOFS);
16441644
if (ret)
16451645
return ret;
16461646

fs/btrfs/extent_io.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4815,7 +4815,7 @@ struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,
48154815
return NULL;
48164816
eb->fs_info = fs_info;
48174817
again:
4818-
ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM);
4818+
ret = radix_tree_preload(GFP_NOFS);
48194819
if (ret)
48204820
goto free_eb;
48214821
spin_lock(&fs_info->buffer_lock);
@@ -4916,7 +4916,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
49164916
if (uptodate)
49174917
set_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags);
49184918
again:
4919-
ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM);
4919+
ret = radix_tree_preload(GFP_NOFS);
49204920
if (ret)
49214921
goto free_eb;
49224922

0 commit comments

Comments
 (0)