From f2d861306b0f47e493ac229380273a81b3495246 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 24 Jan 2013 02:21:54 -0500
Subject: [PATCH] --- yaml --- r: 359185 b: refs/heads/master c:
 182be684784334598eee1d90274e7f7aa0063616 h: refs/heads/master i:   359183:
 913d73facdd7d03d29c4ae4824dc412575f1a3db v: v3

---
 [refs]                     | 2 +-
 trunk/fs/ocfs2/dir.c       | 2 +-
 trunk/fs/ocfs2/file.c      | 4 ++--
 trunk/fs/ocfs2/mmap.c      | 2 +-
 trunk/include/linux/fs.h   | 1 -
 trunk/security/commoncap.c | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 67266ec0de6b..8a84a1a6da3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecf3d1f1aa74da0d632b651a2e05a911f60e92c0
+refs/heads/master: 182be684784334598eee1d90274e7f7aa0063616
diff --git a/trunk/fs/ocfs2/dir.c b/trunk/fs/ocfs2/dir.c
index ac0d4a0e8a41..c87d0793bdec 100644
--- a/trunk/fs/ocfs2/dir.c
+++ b/trunk/fs/ocfs2/dir.c
@@ -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
diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c
index 04098af9dbc8..5bcd865905ef 100644
--- a/trunk/fs/ocfs2/file.c
+++ b/trunk/fs/ocfs2/file.c
@@ -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;
diff --git a/trunk/fs/ocfs2/mmap.c b/trunk/fs/ocfs2/mmap.c
index 07c585b85000..10d66c75cecb 100644
--- a/trunk/fs/ocfs2/mmap.c
+++ b/trunk/fs/ocfs2/mmap.c
@@ -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;
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index da94011ae83c..c766afd1e684 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -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;
 
 	/*
diff --git a/trunk/security/commoncap.c b/trunk/security/commoncap.c
index 7ee08c756d6b..c44b6fe6648e 100644
--- a/trunk/security/commoncap.c
+++ b/trunk/security/commoncap.c
@@ -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);