aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-03-14 20:01:51 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-03-15 17:16:25 -0400
commitb21041d0f72899ed815bd2cbf7275339c74737b6 (patch)
treee9dddabedc599175926ea29603ca366cdc50dbaa
parentce57dfc1791221ef58b6d6b8f5437fccefc4e187 (diff)
update nd->inode in __do_follow_link() instead of after do_follow_link()
... and note that we only need to do it for LAST_BIND symlinks Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/namei.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 549bbe2f25c..9e7b18a8be6 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -768,7 +768,8 @@ __do_follow_link(const struct path *link, struct nameidata *nd, void **p)
error = __vfs_follow_link(nd, s);
else if (nd->last_type == LAST_BIND) {
nd->flags |= LOOKUP_JUMPED;
- if (nd->path.dentry->d_inode->i_op->follow_link) {
+ nd->inode = nd->path.dentry->d_inode;
+ if (nd->inode->i_op->follow_link) {
/* stepped on a _really_ weird one */
path_put(&nd->path);
error = -ELOOP;
@@ -1449,7 +1450,6 @@ static int link_path_walk(const char *name, struct nameidata *nd)
err = do_follow_link(&next, nd);
if (err)
return err;
- nd->inode = nd->path.dentry->d_inode;
}
err = -ENOTDIR;
if (!nd->inode->i_op->lookup)
@@ -1475,7 +1475,6 @@ last_component:
err = do_follow_link(&next, nd);
if (err)
return err;
- nd->inode = nd->path.dentry->d_inode;
}
if (lookup_flags & LOOKUP_DIRECTORY) {
err = -ENOTDIR;