Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

kill f_vfsmnt

very few users left...

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

Al Viro 182be684 ecf3d1f1

+5 -6
+1 -1
fs/ocfs2/dir.c
··· 2020 2020 2021 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 2024 if (lock_level && error >= 0) { 2025 2025 /* We release EX lock which used to update atime 2026 2026 * and get PR lock again to reduce contention
+2 -2
fs/ocfs2/file.c
··· 2526 2526 /* 2527 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 2530 if (ret < 0) { 2531 2531 mlog_errno(ret); 2532 2532 goto bail; ··· 2589 2589 * like i_size. This allows the checks down below 2590 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 2593 if (ret < 0) { 2594 2594 mlog_errno(ret); 2595 2595 goto bail;
+1 -1
fs/ocfs2/mmap.c
··· 181 181 int ret = 0, lock_level = 0; 182 182 183 183 ret = ocfs2_inode_lock_atime(file_inode(file), 184 - file->f_vfsmnt, &lock_level); 184 + file->f_path.mnt, &lock_level); 185 185 if (ret < 0) { 186 186 mlog_errno(ret); 187 187 goto out;
-1
include/linux/fs.h
··· 769 769 } f_u; 770 770 struct path f_path; 771 771 #define f_dentry f_path.dentry 772 - #define f_vfsmnt f_path.mnt 773 772 const struct file_operations *f_op; 774 773 775 774 /*
+1 -1
security/commoncap.c
··· 440 440 if (!file_caps_enabled) 441 441 return 0; 442 442 443 - if (bprm->file->f_vfsmnt->mnt_flags & MNT_NOSUID) 443 + if (bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID) 444 444 return 0; 445 445 446 446 dentry = dget(bprm->file->f_dentry);