leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: GFP_NOFS does not GFP_HIGHMEM

Browse Source 
Masking HIGHMEM out of NOFS does not make sense.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-05-09 14:11:38 +02:00
parent 05135f597a
commit e1860a7724
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/delayed-inode.c
View File

@ -134,7 +134,7 @@ again:
/* cached in the btrfs inode and can be accessed */ /* cached in the btrfs inode and can be accessed */
atomic_add(2, &node->refs); atomic_add(2, &node->refs);
ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM); ret = radix_tree_preload(GFP_NOFS);
if (ret) { if (ret) {
kmem_cache_free(delayed_node_cache, node); kmem_cache_free(delayed_node_cache, node);
return ERR_PTR(ret); return ERR_PTR(ret);

2
fs/btrfs/disk-io.c
View File

@ -1640,7 +1640,7 @@ int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info,
{ {
int ret; int ret;
ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM); ret = radix_tree_preload(GFP_NOFS);
if (ret) if (ret)
return ret; return ret;

4
fs/btrfs/extent_io.c
View File

@ -4815,7 +4815,7 @@ struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,
return NULL; return NULL;
eb->fs_info = fs_info; eb->fs_info = fs_info;
again: again:
ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM); ret = radix_tree_preload(GFP_NOFS);
if (ret) if (ret)
goto free_eb; goto free_eb;
spin_lock(&fs_info->buffer_lock); spin_lock(&fs_info->buffer_lock);
@ -4916,7 +4916,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
if (uptodate) if (uptodate)
set_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags); set_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags);
again: again:
ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM); ret = radix_tree_preload(GFP_NOFS);
if (ret) if (ret)
goto free_eb; goto free_eb;