Merge branch 'dev/gfp-flags' into for-chris-4.6

This commit is contained in:
David Sterba
2016-02-26 15:38:28 +01:00
10 changed files with 60 additions and 56 deletions

View File

@@ -5361,7 +5361,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
goto out;
}
tmp_buf = kmalloc(left_root->nodesize, GFP_NOFS);
tmp_buf = kmalloc(left_root->nodesize, GFP_KERNEL);
if (!tmp_buf) {
ret = -ENOMEM;
goto out;