summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-04-15 01:12:42 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2016-05-03 01:47:24 +0200
commit383d4e8ab02c02f7b31f90174c644d935c223c85 (patch)
treed2de1aa2da96077c92b2c741872930b5cb9ff6d3
parentreiserfs: open-code reiserfs_mutex_lock_safe() in reiserfs_unpack() (diff)
downloadlinux-383d4e8ab02c02f7b31f90174c644d935c223c85.tar.xz
linux-383d4e8ab02c02f7b31f90174c644d935c223c85.zip
reconnect_one(): use lookup_one_len_unlocked()
... and explain the non-obvious logics in case when lookup yields a different dentry. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/exportfs/expfs.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c
index c46f1a190b8d..402c5caab5ca 100644
--- a/fs/exportfs/expfs.c
+++ b/fs/exportfs/expfs.c
@@ -143,14 +143,18 @@ static struct dentry *reconnect_one(struct vfsmount *mnt,
if (err)
goto out_err;
dprintk("%s: found name: %s\n", __func__, nbuf);
- inode_lock(parent->d_inode);
- tmp = lookup_one_len(nbuf, parent, strlen(nbuf));
- inode_unlock(parent->d_inode);
+ tmp = lookup_one_len_unlocked(nbuf, parent, strlen(nbuf));
if (IS_ERR(tmp)) {
dprintk("%s: lookup failed: %d\n", __func__, PTR_ERR(tmp));
goto out_err;
}
if (tmp != dentry) {
+ /*
+ * Somebody has renamed it since exportfs_get_name();
+ * great, since it could've only been renamed if it
+ * got looked up and thus connected, and it would
+ * remain connected afterwards. We are done.
+ */
dput(tmp);
goto out_reconnected;
}