From 213ebc5b1a5a82d94807fabc4cfae176f7d09dd8 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 14 Mar 2011 20:01:51 -0400 Subject: [PATCH] --- yaml --- r: 234290 b: refs/heads/master c: b21041d0f72899ed815bd2cbf7275339c74737b6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a07027ed3a6b..6eb1af62c632 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce57dfc1791221ef58b6d6b8f5437fccefc4e187 +refs/heads/master: b21041d0f72899ed815bd2cbf7275339c74737b6 diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 549bbe2f25c6..9e7b18a8be66 100644 --- a/trunk/fs/namei.c +++ b/trunk/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 @@ 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; } if (lookup_flags & LOOKUP_DIRECTORY) { err = -ENOTDIR;