fix follow_link() breakage
Al Viro [Wed, 16 Mar 2011 06:45:02 +0000 (02:45 -0400)]
commit 574197e0de46a8a4db5c54ef7b65e43ffa8873a7 had a missing
piece, breaking the loop detection ;-/

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/namei.c

index 0a601ca..b912b7a 100644 (file)
@@ -753,9 +753,11 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
 
        BUG_ON(nd->flags & LOOKUP_RCU);
 
+       if (link->mnt == nd->path.mnt)
+               mntget(link->mnt);
+
        if (unlikely(current->total_link_count >= 40)) {
                *p = ERR_PTR(-ELOOP); /* no ->put_link(), please */
-               path_put_conditional(link, nd);
                path_put(&nd->path);
                return -ELOOP;
        }
@@ -765,9 +767,6 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
        touch_atime(link->mnt, dentry);
        nd_set_link(nd, NULL);
 
-       if (link->mnt == nd->path.mnt)
-               mntget(link->mnt);
-
        error = security_inode_follow_link(link->dentry, nd);
        if (error) {
                *p = ERR_PTR(error); /* no ->put_link(), please */