Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 182be684 authored by Al Viro's avatar Al Viro
Browse files

kill f_vfsmnt 



very few users left...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ecf3d1f1

fs/ocfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -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

fs/ocfs2/file.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

fs/ocfs2/mmap.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/fs.h

+0 −1
Original line number Diff line number Diff line
@@ -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;



	/*

security/commoncap.c

+1 −1
Original line number Diff line number Diff line
@@ -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);