Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-17 02:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kill f_vfsmnt

Browse Source 
very few users left...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2013-01-24 02:21:54 -05:00
parent ecf3d1f1aa
commit 182be68478
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ocfs2/dir.c
View 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); 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) { if (lock_level && error >= 0) {
/* We release EX lock which used to update atime /* We release EX lock which used to update atime
* and get PR lock again to reduce contention * and get PR lock again to reduce contention

4
fs/ocfs2/file.c
View File

@ -2526,7 +2526,7 @@ static ssize_t ocfs2_file_splice_read(struct file *in,
/* /*
* See the comment in ocfs2_file_aio_read() * 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) { if (ret < 0) {
mlog_errno(ret); mlog_errno(ret);
goto bail; 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 * like i_size. This allows the checks down below
* generic_file_aio_read() a chance of actually working. * 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) { if (ret < 0) {
mlog_errno(ret); mlog_errno(ret);
goto bail; goto bail;

2
fs/ocfs2/mmap.c
View File

@ -181,7 +181,7 @@ int ocfs2_mmap(struct file *file, struct vm_area_struct *vma)
int ret = 0, lock_level = 0; int ret = 0, lock_level = 0;
ret = ocfs2_inode_lock_atime(file_inode(file), ret = ocfs2_inode_lock_atime(file_inode(file),
file->f_vfsmnt, &lock_level); file->f_path.mnt, &lock_level);
if (ret < 0) { if (ret < 0) {
mlog_errno(ret); mlog_errno(ret);
goto out; goto out;

1
include/linux/fs.h
View File

@ -769,7 +769,6 @@ struct file {
} f_u; } f_u;
struct path f_path; struct path f_path;
#define f_dentry f_path.dentry #define f_dentry f_path.dentry
#define f_vfsmnt f_path.mnt
const struct file_operations *f_op; const struct file_operations *f_op;
/* /*

2
security/commoncap.c
View File

@ -440,7 +440,7 @@ static int get_file_caps(struct linux_binprm *bprm, bool *effective, bool *has_c
if (!file_caps_enabled) if (!file_caps_enabled)
return 0; return 0;
if (bprm->file->f_vfsmnt->mnt_flags & MNT_NOSUID) if (bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID)
return 0; return 0;
dentry = dget(bprm->file->f_dentry); dentry = dget(bprm->file->f_dentry);