Merge remote-tracking branch 'ovl/rename2' into for-linus

[cascardo/linux.git] / fs / btrfs / ioctl.c

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index c48e374..b182197 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1634,6 +1634,9 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
        int namelen;
        int ret = 0;
 
        int namelen;
        int ret = 0;
 

+       if (!S_ISDIR(file_inode(file)->i_mode))
+               return -ENOTDIR;
+

        ret = mnt_want_write_file(file);
        if (ret)
                goto out;
        ret = mnt_want_write_file(file);
        if (ret)
                goto out;


@@ -1691,6 +1694,9 @@ static noinline int btrfs_ioctl_snap_create(struct file *file,
        struct btrfs_ioctl_vol_args *vol_args;
        int ret;
 
        struct btrfs_ioctl_vol_args *vol_args;
        int ret;
 

+       if (!S_ISDIR(file_inode(file)->i_mode))
+               return -ENOTDIR;
+

        vol_args = memdup_user(arg, sizeof(*vol_args));
        if (IS_ERR(vol_args))
                return PTR_ERR(vol_args);
        vol_args = memdup_user(arg, sizeof(*vol_args));
        if (IS_ERR(vol_args))
                return PTR_ERR(vol_args);


@@ -1714,6 +1720,9 @@ static noinline int btrfs_ioctl_snap_create_v2(struct file *file,
        bool readonly = false;
        struct btrfs_qgroup_inherit *inherit = NULL;
 
        bool readonly = false;
        struct btrfs_qgroup_inherit *inherit = NULL;
 

+       if (!S_ISDIR(file_inode(file)->i_mode))
+               return -ENOTDIR;
+

        vol_args = memdup_user(arg, sizeof(*vol_args));
        if (IS_ERR(vol_args))
                return PTR_ERR(vol_args);
        vol_args = memdup_user(arg, sizeof(*vol_args));
        if (IS_ERR(vol_args))
                return PTR_ERR(vol_args);


@@ -2357,6 +2366,9 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
        int ret;
        int err = 0;
 
        int ret;
        int err = 0;
 

+       if (!S_ISDIR(dir->i_mode))
+               return -ENOTDIR;
+

        vol_args = memdup_user(arg, sizeof(*vol_args));
        if (IS_ERR(vol_args))
                return PTR_ERR(vol_args);
        vol_args = memdup_user(arg, sizeof(*vol_args));
        if (IS_ERR(vol_args))
                return PTR_ERR(vol_args);