diff options
| author | David Sterba <dsterba@suse.com> | 2017-05-31 19:32:09 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-06-19 18:26:02 +0200 |
| commit | f54de068dda73e337972481eabd103671859b2aa (patch) | |
| tree | 3233b63f1cbe19b8cb6506ca12a97513f47545aa /fs/btrfs/ioctl.c | |
| parent | de2491fdefe7e599fa08a81a1b89d03c96c9cbc3 (diff) | |
| download | linux-f54de068dda73e337972481eabd103671859b2aa.tar.gz linux-f54de068dda73e337972481eabd103671859b2aa.tar.bz2 linux-f54de068dda73e337972481eabd103671859b2aa.zip | |
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 @@ #include <linux/bit_spinlock.h> #include <linux/security.h> #include <linux/xattr.h> -#include <linux/vmalloc.h> +#include <linux/mm.h> #include <linux/slab.h> #include <linux/blkdev.h> #include <linux/uuid.h> @@ -4588,7 +4588,7 @@ static long btrfs_ioctl_logical_to_ino(struct btrfs_fs_info *fs_info, out: btrfs_free_path(path); - vfree(inodes); + kvfree(inodes); kfree(loi); return ret; |