kill f_vfsmnt
Al Viro [Thu, 24 Jan 2013 07:21:54 +0000 (02:21 -0500)]
very few users left...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/ocfs2/dir.c
fs/ocfs2/file.c
fs/ocfs2/mmap.c
include/linux/fs.h
security/commoncap.c

index ac0d4a0..c87d079 100644 (file)
@@ -2020,7 +2020,7 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir)
 
        trace_ocfs2_readdir((unsigned long long)OCFS2_I(inode)->ip_blkno);
 
-       error = ocfs2_inode_lock_atime(inode, filp->f_vfsmnt, &lock_level);
+       error = ocfs2_inode_lock_atime(inode, filp->f_path.mnt, &lock_level);
        if (lock_level && error >= 0) {
                /* We release EX lock which used to update atime
                 * and get PR lock again to reduce contention
index 04098af..5bcd865 100644 (file)
@@ -2526,7 +2526,7 @@ static ssize_t ocfs2_file_splice_read(struct file *in,
        /*
         * See the comment in ocfs2_file_aio_read()
         */
-       ret = ocfs2_inode_lock_atime(inode, in->f_vfsmnt, &lock_level);
+       ret = ocfs2_inode_lock_atime(inode, in->f_path.mnt, &lock_level);
        if (ret < 0) {
                mlog_errno(ret);
                goto bail;
@@ -2589,7 +2589,7 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb,
         * like i_size. This allows the checks down below
         * generic_file_aio_read() a chance of actually working.
         */
-       ret = ocfs2_inode_lock_atime(inode, filp->f_vfsmnt, &lock_level);
+       ret = ocfs2_inode_lock_atime(inode, filp->f_path.mnt, &lock_level);
        if (ret < 0) {
                mlog_errno(ret);
                goto bail;
index 07c585b..10d66c7 100644 (file)
@@ -181,7 +181,7 @@ int ocfs2_mmap(struct file *file, struct vm_area_struct *vma)
        int ret = 0, lock_level = 0;
 
        ret = ocfs2_inode_lock_atime(file_inode(file),
-                                   file->f_vfsmnt, &lock_level);
+                                   file->f_path.mnt, &lock_level);
        if (ret < 0) {
                mlog_errno(ret);
                goto out;
index da94011..c766afd 100644 (file)
@@ -769,7 +769,6 @@ struct file {
        } f_u;
        struct path             f_path;
 #define f_dentry       f_path.dentry
-#define f_vfsmnt       f_path.mnt
        const struct file_operations    *f_op;
 
        /*
index 7ee08c7..c44b6fe 100644 (file)
@@ -440,7 +440,7 @@ static int get_file_caps(struct linux_binprm *bprm, bool *effective, bool *has_c
        if (!file_caps_enabled)
                return 0;
 
-       if (bprm->file->f_vfsmnt->mnt_flags & MNT_NOSUID)
+       if (bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID)
                return 0;
 
        dentry = dget(bprm->file->f_dentry);