aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-01-24 02:21:54 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-26 02:46:10 -0500
commit182be684784334598eee1d90274e7f7aa0063616 (patch)
tree7b4d555a24fbbe9b22086f31246d1aa6df5e5330 /fs/ocfs2
parentecf3d1f1aa74da0d632b651a2e05a911f60e92c0 (diff)
kill f_vfsmnt
very few users left... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/dir.c2
-rw-r--r--fs/ocfs2/file.c4
-rw-r--r--fs/ocfs2/mmap.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index ac0d4a0e8a41..c87d0793bdec 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -2020,7 +2020,7 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir)
2020 2020
2021 trace_ocfs2_readdir((unsigned long long)OCFS2_I(inode)->ip_blkno); 2021 trace_ocfs2_readdir((unsigned long long)OCFS2_I(inode)->ip_blkno);
2022 2022
2023 error = ocfs2_inode_lock_atime(inode, filp->f_vfsmnt, &lock_level); 2023 error = ocfs2_inode_lock_atime(inode, filp->f_path.mnt, &lock_level);
2024 if (lock_level && error >= 0) { 2024 if (lock_level && error >= 0) {
2025 /* We release EX lock which used to update atime 2025 /* We release EX lock which used to update atime
2026 * and get PR lock again to reduce contention 2026 * and get PR lock again to reduce contention
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 04098af9dbc8..5bcd865905ef 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2526,7 +2526,7 @@ static ssize_t ocfs2_file_splice_read(struct file *in,
2526 /* 2526 /*
2527 * See the comment in ocfs2_file_aio_read() 2527 * See the comment in ocfs2_file_aio_read()
2528 */ 2528 */
2529 ret = ocfs2_inode_lock_atime(inode, in->f_vfsmnt, &lock_level); 2529 ret = ocfs2_inode_lock_atime(inode, in->f_path.mnt, &lock_level);
2530 if (ret < 0) { 2530 if (ret < 0) {
2531 mlog_errno(ret); 2531 mlog_errno(ret);
2532 goto bail; 2532 goto bail;
@@ -2589,7 +2589,7 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb,
2589 * like i_size. This allows the checks down below 2589 * like i_size. This allows the checks down below
2590 * generic_file_aio_read() a chance of actually working. 2590 * generic_file_aio_read() a chance of actually working.
2591 */ 2591 */
2592 ret = ocfs2_inode_lock_atime(inode, filp->f_vfsmnt, &lock_level); 2592 ret = ocfs2_inode_lock_atime(inode, filp->f_path.mnt, &lock_level);
2593 if (ret < 0) { 2593 if (ret < 0) {
2594 mlog_errno(ret); 2594 mlog_errno(ret);
2595 goto bail; 2595 goto bail;
diff --git a/fs/ocfs2/mmap.c b/fs/ocfs2/mmap.c
index 07c585b85000..10d66c75cecb 100644
--- a/fs/ocfs2/mmap.c
+++ b/fs/ocfs2/mmap.c
@@ -181,7 +181,7 @@ int ocfs2_mmap(struct file *file, struct vm_area_struct *vma)
181 int ret = 0, lock_level = 0; 181 int ret = 0, lock_level = 0;
182 182
183 ret = ocfs2_inode_lock_atime(file_inode(file), 183 ret = ocfs2_inode_lock_atime(file_inode(file),
184 file->f_vfsmnt, &lock_level); 184 file->f_path.mnt, &lock_level);
185 if (ret < 0) { 185 if (ret < 0) {
186 mlog_errno(ret); 186 mlog_errno(ret);
187 goto out; 187 goto out;