[PATCH] 9p: don't use v9fs_parent_fid() when v9fs_fid_clone() is needed

Johannes Berg
2016-08-01T21:31:47Z

The introduction of v9fs_parent_fid() broke v9fs_vfs_rename()
since that doesn't just do v9fs_fid_lookup() but rather uses
v9fs_fid_clone() on the ->d_parent.

I suppose it'd be possible to introduce v9fs_clone_parent_fid()
but I decided that just reverting the broken change was better
for now.

Fixes: 77d5a6b7d992 ("9p: new helper - v9fs_parent_fid()")
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
fs/9p/vfs_inode.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 7da9a8354fad..d6488fb95dbf 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -975,13 +975,13 @@ v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
if (IS_ERR(oldfid))
return PTR_ERR(oldfid);

- olddirfid = v9fs_parent_fid(old_dentry);
+ olddirfid = v9fs_fid_clone(old_dentry->d_parent);
if (IS_ERR(olddirfid)) {
retval = PTR_ERR(olddirfid);
goto done;
}

- newdirfid = v9fs_parent_fid(new_dentry);
+ newdirfid = v9fs_fid_clone(new_dentry->d_parent);
if (IS_ERR(newdirfid)) {
retval = PTR_ERR(newdirfid);
goto clunk_olddir;
--
2.8.1