get_link: nd->depth massage, part 6

make get_link() increment nd->depth on successful exit

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

diff --git a/fs/namei.c b/fs/namei.c
index 5753f46d83216c3367421b2388cb5190e9e394f7..93b5f7353e705de6799ed457d4908ee0c6d7f3e3 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -918,8 +918,10 @@ const char *get_link(struct nameidata *nd)
 out:
                        path_put(&nd->path);
                        path_put(&last->link);
+                       return res;
                }
        }
+       nd->depth++;
        return res;
 }
 
@@ -1830,11 +1832,9 @@ Walked:
                        }
 
                        s = get_link(nd);
-                       nd->depth++;
 
                        if (unlikely(IS_ERR(s))) {
                                err = PTR_ERR(s);
-                               nd->depth--;
                                goto Err;
                        }
                        err = 0;
@@ -2009,7 +2009,6 @@ static int trailing_symlink(struct nameidata *nd)
        s = get_link(nd);
        if (unlikely(IS_ERR(s)))
                return PTR_ERR(s);
-       nd->depth++;
        if (unlikely(!s)) {
                nd->depth--;
                return 0;