diff options
| author | David Sterba <dsterba@suse.com> | 2016-05-16 15:46:24 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-05-16 15:46:24 +0200 |
| commit | 5ef64a3e757c94b2f2fc61465ef9603aaacaecff (patch) | |
| tree | 5f8da3043723e98e8313ebf180fe84a9a12b8db0 /fs/btrfs/delayed-inode.c | |
| parent | 73d32ce21e1701eaafcea3cbc2a8f27ab1967abe (diff) | |
| parent | e1860a7724828a341037b010b3f4ff58bad53f95 (diff) | |
Merge branch 'cleanups-4.7' into for-chris-4.7-20160516
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: /* cached in the btrfs inode and can be accessed */ atomic_add(2, &node->refs); - ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM); + ret = radix_tree_preload(GFP_NOFS); if (ret) { kmem_cache_free(delayed_node_cache, node); return ERR_PTR(ret); |