diff options
| author | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:28 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:28 +0100 |
| commit | e22b3d1fbe596c7feba6782dab2e11c7b99f1d90 (patch) | |
| tree | 50cfe9b71c227c8661b785ab3a0a5cab33ad8e3f /fs/btrfs/ctree.c | |
| parent | 5f1b5664d97842bc5dba40c2053bf95270b6ff7a (diff) | |
| parent | 66722f7c059089ad7f11eaa3e27af2321ab1b0e6 (diff) | |
Merge branch 'dev/gfp-flags' into for-chris-4.6
Diffstat (limited to 'fs/btrfs/ctree.c')
| -rw-r--r-- | fs/btrfs/ctree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index f5ef7d171bb8..77592931ab4f 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -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; |