summaryrefslogtreecommitdiffstats
path: root/fs/9p
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-06-30 23:30:06 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2016-06-30 23:30:06 -0400
commitc074cefcc0f75152bc74a1c4f2e7b662f09403d4 (patch)
tree5b323c1c83ecfb7a2de95b26969adc7cb5d8d507 /fs/9p
parentea7d4c046ba6e2c6135c98721f4f09efd1adaabc (diff)
parente06b933e6ded42384164d28a2060b7f89243b895 (diff)
downloadlinux-c074cefcc0f75152bc74a1c4f2e7b662f09403d4.tar.gz
linux-c074cefcc0f75152bc74a1c4f2e7b662f09403d4.tar.bz2
linux-c074cefcc0f75152bc74a1c4f2e7b662f09403d4.zip
Merge branch 'for-linus' into work.misc
Diffstat (limited to 'fs/9p')
-rw-r--r--fs/9p/vfs_file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index b84c291ba1eb..d7b78d531e63 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -74,7 +74,7 @@ int v9fs_file_open(struct inode *inode, struct file *file)
v9fs_proto_dotu(v9ses));
fid = file->private_data;
if (!fid) {
- fid = v9fs_fid_clone(file->f_path.dentry);
+ fid = v9fs_fid_clone(file_dentry(file));
if (IS_ERR(fid))
return PTR_ERR(fid);
@@ -100,7 +100,7 @@ int v9fs_file_open(struct inode *inode, struct file *file)
* because we want write after unlink usecase
* to work.
*/
- fid = v9fs_writeback_fid(file->f_path.dentry);
+ fid = v9fs_writeback_fid(file_dentry(file));
if (IS_ERR(fid)) {
err = PTR_ERR(fid);
mutex_unlock(&v9inode->v_mutex);
@@ -516,7 +516,7 @@ v9fs_mmap_file_mmap(struct file *filp, struct vm_area_struct *vma)
* because we want write after unlink usecase
* to work.
*/
- fid = v9fs_writeback_fid(filp->f_path.dentry);
+ fid = v9fs_writeback_fid(file_dentry(filp));
if (IS_ERR(fid)) {
retval = PTR_ERR(fid);
mutex_unlock(&v9inode->v_mutex);