From: Josef "Jeff" Sipek Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the 9p filesystem. Signed-off-by: Josef "Jeff" Sipek Signed-off-by: Andrew Morton --- fs/9p/vfs_addr.c | 2 +- fs/9p/vfs_dir.c | 4 ++-- fs/9p/vfs_file.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff -puN fs/9p/vfs_addr.c~9p-change-uses-of-f_dentryvfsmnt-to-use-f_path fs/9p/vfs_addr.c --- a/fs/9p/vfs_addr.c~9p-change-uses-of-f_dentryvfsmnt-to-use-f_path +++ a/fs/9p/vfs_addr.c @@ -54,7 +54,7 @@ static int v9fs_vfs_readpage(struct file int retval = -EIO; loff_t offset = page_offset(page); int count = PAGE_CACHE_SIZE; - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = filp->f_path.dentry->d_inode; struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); int rsize = v9ses->maxdata - V9FS_IOHDRSZ; struct v9fs_fid *v9f = filp->private_data; diff -puN fs/9p/vfs_dir.c~9p-change-uses-of-f_dentryvfsmnt-to-use-f_path fs/9p/vfs_dir.c --- a/fs/9p/vfs_dir.c~9p-change-uses-of-f_dentryvfsmnt-to-use-f_path +++ a/fs/9p/vfs_dir.c @@ -70,7 +70,7 @@ static inline int dt_type(struct v9fs_st static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir) { struct v9fs_fcall *fcall = NULL; - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = filp->f_path.dentry->d_inode; struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); struct v9fs_fid *file = filp->private_data; unsigned int i, n, s; @@ -79,7 +79,7 @@ static int v9fs_dir_readdir(struct file struct v9fs_stat stat; int over = 0; - dprintk(DEBUG_VFS, "name %s\n", filp->f_dentry->d_name.name); + dprintk(DEBUG_VFS, "name %s\n", filp->f_path.dentry->d_name.name); fid = file->fid; diff -puN fs/9p/vfs_file.c~9p-change-uses-of-f_dentryvfsmnt-to-use-f_path fs/9p/vfs_file.c --- a/fs/9p/vfs_file.c~9p-change-uses-of-f_dentryvfsmnt-to-use-f_path +++ a/fs/9p/vfs_file.c @@ -59,7 +59,7 @@ int v9fs_file_open(struct inode *inode, dprintk(DEBUG_VFS, "inode: %p file: %p \n", inode, file); - vfid = v9fs_fid_lookup(file->f_dentry); + vfid = v9fs_fid_lookup(file->f_path.dentry); if (!vfid) { dprintk(DEBUG_ERROR, "Couldn't resolve fid from dentry\n"); return -EBADF; @@ -132,7 +132,7 @@ free_fcall: static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl) { int res = 0; - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = filp->f_path.dentry->d_inode; dprintk(DEBUG_VFS, "filp: %p lock: %p\n", filp, fl); @@ -160,7 +160,7 @@ static ssize_t v9fs_file_read(struct file *filp, char __user * data, size_t count, loff_t * offset) { - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = filp->f_path.dentry->d_inode; struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); struct v9fs_fid *v9f = filp->private_data; struct v9fs_fcall *fcall = NULL; @@ -224,7 +224,7 @@ static ssize_t v9fs_file_write(struct file *filp, const char __user * data, size_t count, loff_t * offset) { - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = filp->f_path.dentry->d_inode; struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); struct v9fs_fid *v9fid = filp->private_data; struct v9fs_fcall *fcall; _