From: Josef "Jeff" Sipek Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the ntfs filesystem code. Signed-off-by: Josef "Jeff" Sipek Signed-off-by: Andrew Morton --- fs/ntfs/dir.c | 6 +++--- fs/ntfs/file.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN fs/ntfs/dir.c~ntfs-change-uses-of-f_dentry-vfsmnt-to-use-f_path fs/ntfs/dir.c --- a/fs/ntfs/dir.c~ntfs-change-uses-of-f_dentry-vfsmnt-to-use-f_path +++ a/fs/ntfs/dir.c @@ -1101,7 +1101,7 @@ static int ntfs_readdir(struct file *fil { s64 ia_pos, ia_start, prev_ia_pos, bmp_pos; loff_t fpos, i_size; - struct inode *bmp_vi, *vdir = filp->f_dentry->d_inode; + struct inode *bmp_vi, *vdir = filp->f_path.dentry->d_inode; struct super_block *sb = vdir->i_sb; ntfs_inode *ndir = NTFS_I(vdir); ntfs_volume *vol = NTFS_SB(sb); @@ -1136,9 +1136,9 @@ static int ntfs_readdir(struct file *fil if (fpos == 1) { ntfs_debug("Calling filldir for .. with len 2, fpos 0x1, " "inode 0x%lx, DT_DIR.", - (unsigned long)parent_ino(filp->f_dentry)); + (unsigned long)parent_ino(filp->f_path.dentry)); rc = filldir(dirent, "..", 2, fpos, - parent_ino(filp->f_dentry), DT_DIR); + parent_ino(filp->f_path.dentry), DT_DIR); if (rc) goto done; fpos++; diff -puN fs/ntfs/file.c~ntfs-change-uses-of-f_dentry-vfsmnt-to-use-f_path fs/ntfs/file.c --- a/fs/ntfs/file.c~ntfs-change-uses-of-f_dentry-vfsmnt-to-use-f_path +++ a/fs/ntfs/file.c @@ -2162,7 +2162,7 @@ static ssize_t ntfs_file_aio_write_noloc goto out; if (!count) goto out; - err = remove_suid(file->f_dentry); + err = remove_suid(file->f_path.dentry); if (err) goto out; file_update_time(file); _