diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 13:24:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 13:24:24 +1100 |
| commit | 7f36522fa5c8192dccee0f0a414f1b7b336b9c87 (patch) | |
| tree | 443ab002a359443792f43c48790e91539a01e4d4 /fs/btrfs/ctree.c | |
| parent | bab31490ee78b5c5531bae6d54d411a49d2c2f30 (diff) | |
| parent | 28415881a8fced951563443d0a95f9f14cea8687 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'fs/btrfs/ctree.c')
| -rw-r--r-- | fs/btrfs/ctree.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 7dc8844037e0..1c3b6c54d5ee 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -5392,13 +5392,10 @@ int btrfs_compare_trees(struct btrfs_root *left_root, goto out; } - tmp_buf = kmalloc(fs_info->nodesize, GFP_KERNEL | __GFP_NOWARN); + tmp_buf = kvmalloc(fs_info->nodesize, GFP_KERNEL); if (!tmp_buf) { - tmp_buf = vmalloc(fs_info->nodesize); - if (!tmp_buf) { - ret = -ENOMEM; - goto out; - } + ret = -ENOMEM; + goto out; } left_path->search_commit_root = 1; |