diff options
| author | Chris Mason <clm@fb.com> | 2016-05-17 17:24:44 -0400 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-05-17 17:24:44 -0400 |
| commit | a88336d13c66fc171f336c6332fcb67339894e08 (patch) | |
| tree | 595935ba3afc91dce9be83ca65932f3cf1379436 /fs/btrfs/delayed-inode.c | |
| parent | 02da2d72174c61988eb4456b53f405e3ebdebce4 (diff) | |
| parent | 680834ca0ad4e9827048d4bda1e38db69c3dd1e4 (diff) | |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7
Diffstat (limited to 'fs/btrfs/delayed-inode.c')
| -rw-r--r-- | fs/btrfs/delayed-inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 6cef0062f929..61561c2a3f96 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c | |||
| @@ -134,7 +134,7 @@ again: | |||
| 134 | /* cached in the btrfs inode and can be accessed */ | 134 | /* cached in the btrfs inode and can be accessed */ |
| 135 | atomic_add(2, &node->refs); | 135 | atomic_add(2, &node->refs); |
| 136 | 136 | ||
| 137 | ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM); | 137 | ret = radix_tree_preload(GFP_NOFS); |
| 138 | if (ret) { | 138 | if (ret) { |
| 139 | kmem_cache_free(delayed_node_cache, node); | 139 | kmem_cache_free(delayed_node_cache, node); |
| 140 | return ERR_PTR(ret); | 140 | return ERR_PTR(ret); |