From: Josef "Jeff" Sipek Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the ext2 filesystem. Signed-off-by: Josef "Jeff" Sipek Signed-off-by: Andrew Morton --- fs/ext2/dir.c | 2 +- fs/ext2/ioctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN fs/ext2/dir.c~ext2-change-uses-of-f_dentry-vfsmnt-to-use-f_path fs/ext2/dir.c --- a/fs/ext2/dir.c~ext2-change-uses-of-f_dentry-vfsmnt-to-use-f_path +++ a/fs/ext2/dir.c @@ -248,7 +248,7 @@ static int ext2_readdir (struct file * filp, void * dirent, filldir_t filldir) { loff_t pos = filp->f_pos; - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = filp->f_path.dentry->d_inode; struct super_block *sb = inode->i_sb; unsigned int offset = pos & ~PAGE_CACHE_MASK; unsigned long n = pos >> PAGE_CACHE_SHIFT; diff -puN fs/ext2/ioctl.c~ext2-change-uses-of-f_dentry-vfsmnt-to-use-f_path fs/ext2/ioctl.c --- a/fs/ext2/ioctl.c~ext2-change-uses-of-f_dentry-vfsmnt-to-use-f_path +++ a/fs/ext2/ioctl.c @@ -135,7 +135,7 @@ int ext2_ioctl (struct inode * inode, st #ifdef CONFIG_COMPAT long ext2_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - struct inode *inode = file->f_dentry->d_inode; + struct inode *inode = file->f_path.dentry->d_inode; int ret; /* These are just misnamed, they actually get/put from/to user an int */ _