evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

9p: make sure ->lookup() adds fid to the right dentry

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2013-02-28 01:29:48 -05:00
parent 7b5be62199
commit a3b2157e72
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs/9p/vfs_inode.c
View file

@ -824,7 +824,6 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
p9_client_clunk(fid); p9_client_clunk(fid);
return ERR_CAST(inode); return ERR_CAST(inode);
} }
v9fs_fid_add(dentry, fid);
/* /*
* If we had a rename on the server and a parallel lookup * If we had a rename on the server and a parallel lookup
* for the new name, then make sure we instantiate with * for the new name, then make sure we instantiate with
@ -833,7 +832,11 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
* k/b. * k/b.
*/ */
res = d_materialise_unique(dentry, inode); res = d_materialise_unique(dentry, inode);
if (IS_ERR(res)) if (!res)
v9fs_fid_add(dentry, fid);
else if (!IS_ERR(res))
v9fs_fid_add(res, fid);
else
p9_client_clunk(fid); p9_client_clunk(fid);
return res; return res;
} }