UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: reada: use GFP_KERNEL everywhere 

The readahead framework is not on the critical writeback path we don't
need to use GFP_NOFS for allocations. All error paths are handled and
the readahead failures are not fatal. The actual users (scrub,
dev-replace) will trigger reads if the blocks are not found in cache.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-01-18 18:42:13 +01:00
parent e780b0d1c1
commit ed0244faf5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/btrfs/reada.c
View File

@ -280,7 +280,7 @@ static struct reada_zone *reada_find_zone(struct btrfs_fs_info *fs_info,
end = start + cache->key.offset - 1; end = start + cache->key.offset - 1;
btrfs_put_block_group(cache); btrfs_put_block_group(cache);
zone = kzalloc(sizeof(*zone), GFP_NOFS); zone = kzalloc(sizeof(*zone), GFP_KERNEL);
if (!zone) if (!zone)
return NULL; return NULL;
@ -343,7 +343,7 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root,
if (re) if (re)
return re; return re;
re = kzalloc(sizeof(*re), GFP_NOFS); re = kzalloc(sizeof(*re), GFP_KERNEL);
if (!re) if (!re)
return NULL; return NULL;
@ -566,7 +566,7 @@ static int reada_add_block(struct reada_control *rc, u64 logical,
if (!re) if (!re)
return -1; return -1;
rec = kzalloc(sizeof(*rec), GFP_NOFS); rec = kzalloc(sizeof(*rec), GFP_KERNEL);
if (!rec) { if (!rec) {
reada_extent_put(root->fs_info, re); reada_extent_put(root->fs_info, re);
return -ENOMEM; return -ENOMEM;
@ -791,7 +791,7 @@ static void reada_start_machine(struct btrfs_fs_info *fs_info)
{ {
struct reada_machine_work *rmw; struct reada_machine_work *rmw;
rmw = kzalloc(sizeof(*rmw), GFP_NOFS); rmw = kzalloc(sizeof(*rmw), GFP_KERNEL);
if (!rmw) { if (!rmw) {
/* FIXME we cannot handle this properly right now */ /* FIXME we cannot handle this properly right now */
BUG(); BUG();
@ -926,7 +926,7 @@ struct reada_control *btrfs_reada_add(struct btrfs_root *root,
.offset = (u64)-1 .offset = (u64)-1
}; };
rc = kzalloc(sizeof(*rc), GFP_NOFS); rc = kzalloc(sizeof(*rc), GFP_KERNEL);
if (!rc) if (!rc)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);