]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Btrfs: reorder locks and sanity checks in btrfs_ioctl_defrag
authorIlya Dryomov <idryomov@gmail.com>
Sun, 20 Jan 2013 13:57:57 +0000 (15:57 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Sun, 20 Jan 2013 14:21:22 +0000 (16:21 +0200)
Operation-specific check (whether subvol is readonly or not) should go
after the mutual exclusiveness check.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
fs/btrfs/ioctl.c

index f5c1c150d9f3be7bcf2feb2edc0601dabc5ad3c3..afbf3ac2079d32df58a2b0912f5f03267bae77bf 100644 (file)
@@ -2186,19 +2186,20 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp)
        struct btrfs_ioctl_defrag_range_args *range;
        int ret;
 
-       if (btrfs_root_readonly(root))
-               return -EROFS;
+       ret = mnt_want_write_file(file);
+       if (ret)
+               return ret;
 
        if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running,
                        1)) {
                pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n");
+               mnt_drop_write_file(file);
                return -EINVAL;
        }
-       ret = mnt_want_write_file(file);
-       if (ret) {
-               atomic_set(&root->fs_info->mutually_exclusive_operation_running,
-                          0);
-               return ret;
+
+       if (btrfs_root_readonly(root)) {
+               ret = -EROFS;
+               goto out;
        }
 
        switch (inode->i_mode & S_IFMT) {
@@ -2250,8 +2251,8 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp)
                ret = -EINVAL;
        }
 out:
-       mnt_drop_write_file(file);
        atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0);
+       mnt_drop_write_file(file);
        return ret;
 }