Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1860a77 authored by David Sterba's avatar David Sterba
Browse files

btrfs: GFP_NOFS does not GFP_HIGHMEM 



Masking HIGHMEM out of NOFS does not make sense.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 05135f59

fs/btrfs/delayed-inode.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node( 
	/* 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);

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/btrfs/extent_io.c

+2 −2
Original line number Diff line number Diff line
@@ -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;