From: Josef "Jeff" Sipek Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the autofs filesystem. Signed-off-by: Josef "Jeff" Sipek Signed-off-by: Andrew Morton --- fs/autofs/root.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN fs/autofs/root.c~autofs-change-uses-of-f_dentry fs/autofs/root.c --- a/fs/autofs/root.c~autofs-change-uses-of-f_dentry +++ a/fs/autofs/root.c @@ -45,7 +45,7 @@ static int autofs_root_readdir(struct fi struct autofs_dir_ent *ent = NULL; struct autofs_dirhash *dirhash; struct autofs_sb_info *sbi; - struct inode * inode = filp->f_dentry->d_inode; + struct inode * inode = filp->f_path.dentry->d_inode; off_t onr, nr; lock_kernel(); @@ -557,7 +557,7 @@ static int autofs_root_ioctl(struct inod case AUTOFS_IOC_SETTIMEOUT: return autofs_get_set_timeout(sbi, argp); case AUTOFS_IOC_EXPIRE: - return autofs_expire_run(inode->i_sb, sbi, filp->f_vfsmnt, + return autofs_expire_run(inode->i_sb, sbi, filp->f_path.mnt, argp); default: return -ENOSYS; _