tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Btrfs: remove redundant r/o check for superblock

Browse Source 
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>
This commit is contained in:
Liu Bo
2012-06-29 03:58:47 -06:00
committed by Chris Mason
parent a874a63e13
commit 768e9dfe82
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/btrfs/ioctl.c
-7
View File
@@ -1381,14 +1381,10 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
u64 *transid, u64 *transid,
bool readonly) bool readonly)
{ {
struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root;
struct file *src_file; struct file *src_file;
int namelen; int namelen;
int ret = 0; int ret = 0;
if (root->fs_info->sb->s_flags & MS_RDONLY)
return -EROFS;
ret = mnt_want_write_file(file); ret = mnt_want_write_file(file);
if (ret) if (ret)
goto out; goto out;
@@ -3269,9 +3265,6 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg)
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
if (fs_info->sb->s_flags & MS_RDONLY)
return -EROFS;
ret = mnt_want_write(file->f_path.mnt); ret = mnt_want_write(file->f_path.mnt);
if (ret) if (ret)
return ret; return ret;