diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-11-23 11:57:51 -0500 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2015-05-02 14:34:32 +0200 |
| commit | d509b28e2e1618fbd3e1089615d700d0925250d8 (patch) | |
| tree | daef14608d3ae77dfb119dfbaebe9a1314cab9fd /fs/nilfs2 | |
| parent | 04667e4abf4b16a5f90fa2a4e67461c1dd305729 (diff) | |
| download | kernel_samsung_tuna-d509b28e2e1618fbd3e1089615d700d0925250d8.zip kernel_samsung_tuna-d509b28e2e1618fbd3e1089615d700d0925250d8.tar.gz kernel_samsung_tuna-d509b28e2e1618fbd3e1089615d700d0925250d8.tar.bz2 | |
switch a bunch of places to mnt_want_write_file()
it's both faster (in case when file has been opened for write) and cleaner.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Conflicts:
fs/ext4/ioctl.c
fs/nfsd/nfs4recover.c
fs/xfs/xfs_ioctl.c
Change-Id: Ibb2cc434d8d320d7c1790add3108330f6d5b2fc5
Diffstat (limited to 'fs/nilfs2')
| -rw-r--r-- | fs/nilfs2/ioctl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c index cee648e..db3790d 100644 --- a/fs/nilfs2/ioctl.c +++ b/fs/nilfs2/ioctl.c @@ -27,7 +27,7 @@ #include <linux/uaccess.h> /* copy_from_user(), copy_to_user() */ #include <linux/vmalloc.h> #include <linux/compat.h> /* compat_ptr() */ -#include <linux/mount.h> /* mnt_want_write(), mnt_drop_write() */ +#include <linux/mount.h> /* mnt_want_write_file(), mnt_drop_write() */ #include <linux/buffer_head.h> #include <linux/nilfs2_fs.h> #include "nilfs.h" @@ -119,7 +119,7 @@ static int nilfs_ioctl_setflags(struct inode *inode, struct file *filp, if (get_user(flags, (int __user *)argp)) return -EFAULT; - ret = mnt_want_write(filp->f_path.mnt); + ret = mnt_want_write_file(filp); if (ret) return ret; @@ -174,7 +174,7 @@ static int nilfs_ioctl_change_cpmode(struct inode *inode, struct file *filp, if (!capable(CAP_SYS_ADMIN)) return -EPERM; - ret = mnt_want_write(filp->f_path.mnt); + ret = mnt_want_write_file(filp); if (ret) return ret; @@ -210,7 +210,7 @@ nilfs_ioctl_delete_checkpoint(struct inode *inode, struct file *filp, if (!capable(CAP_SYS_ADMIN)) return -EPERM; - ret = mnt_want_write(filp->f_path.mnt); + ret = mnt_want_write_file(filp); if (ret) return ret; @@ -591,7 +591,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp, if (!capable(CAP_SYS_ADMIN)) return -EPERM; - ret = mnt_want_write(filp->f_path.mnt); + ret = mnt_want_write_file(filp); if (ret) return ret; @@ -710,7 +710,7 @@ static int nilfs_ioctl_resize(struct inode *inode, struct file *filp, if (!capable(CAP_SYS_ADMIN)) goto out; - ret = mnt_want_write(filp->f_path.mnt); + ret = mnt_want_write_file(filp); if (ret) goto out; |