Btrfs: remove redundant r/o check for superblock
authorLiu Bo <liubo2009@cn.fujitsu.com>
Fri, 29 Jun 2012 09:58:47 +0000 (03:58 -0600)
committerChris Mason <chris.mason@fusionio.com>
Mon, 23 Jul 2012 20:27:56 +0000 (16:27 -0400)
mnt_want_write() and mnt_want_write_file() will check sb->s_flags with
MS_RDONLY, and we don't need to do it ourselves.

Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
fs/btrfs/ioctl.c

index c1f4975648efcbd21c6286d6674ef792109681f6..b8034dc62e38fcced8bedaccb8b8a6bd7157c921 100644 (file)
@@ -1381,14 +1381,10 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
                                                    u64 *transid,
                                                    bool readonly)
 {
-       struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root;
        struct file *src_file;
        int namelen;
        int ret = 0;
 
-       if (root->fs_info->sb->s_flags & MS_RDONLY)
-               return -EROFS;
-
        ret = mnt_want_write_file(file);
        if (ret)
                goto out;
@@ -3269,9 +3265,6 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg)
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       if (fs_info->sb->s_flags & MS_RDONLY)
-               return -EROFS;
-
        ret = mnt_want_write(file->f_path.mnt);
        if (ret)
                return ret;