diff options
author | David Sterba <dsterba@suse.com> | 2017-05-31 13:32:09 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2017-06-19 12:26:02 -0400 |
commit | f54de068dda73e337972481eabd103671859b2aa (patch) | |
tree | 3233b63f1cbe19b8cb6506ca12a97513f47545aa /fs/btrfs/ioctl.c | |
parent | de2491fdefe7e599fa08a81a1b89d03c96c9cbc3 (diff) |
btrfs: use GFP_KERNEL in init_ipath
Now that init_ipath is called either from a safe context or with
memalloc_nofs protection, we can switch to GFP_KERNEL allocations in
init_path and init_data_container.
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r-- | fs/btrfs/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index c9cdea8061bc..e4116f9248c2 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include <linux/bit_spinlock.h> | 37 | #include <linux/bit_spinlock.h> |
38 | #include <linux/security.h> | 38 | #include <linux/security.h> |
39 | #include <linux/xattr.h> | 39 | #include <linux/xattr.h> |
40 | #include <linux/vmalloc.h> | 40 | #include <linux/mm.h> |
41 | #include <linux/slab.h> | 41 | #include <linux/slab.h> |
42 | #include <linux/blkdev.h> | 42 | #include <linux/blkdev.h> |
43 | #include <linux/uuid.h> | 43 | #include <linux/uuid.h> |
@@ -4588,7 +4588,7 @@ static long btrfs_ioctl_logical_to_ino(struct btrfs_fs_info *fs_info, | |||
4588 | 4588 | ||
4589 | out: | 4589 | out: |
4590 | btrfs_free_path(path); | 4590 | btrfs_free_path(path); |
4591 | vfree(inodes); | 4591 | kvfree(inodes); |
4592 | kfree(loi); | 4592 | kfree(loi); |
4593 | 4593 | ||
4594 | return ret; | 4594 | return ret; |