namei: lift (open-coded) terminate_walk() into callers of get_link()

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

diff --git a/fs/namei.c b/fs/namei.c
index d99eaacab2a7bab02079ee9bb03ca7fb717d8cf7..db21e042619383336426bac93f7d7dc6adb67786 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -892,7 +892,6 @@ const char *get_link(struct nameidata *nd)
                mntget(nd->link.mnt);
 
        if (unlikely(current->total_link_count >= MAXSYMLINKS)) {
-               path_put(&nd->path);
                path_put(&nd->link);
                return ERR_PTR(-ELOOP);
        }
@@ -916,7 +915,6 @@ const char *get_link(struct nameidata *nd)
                res = inode->i_op->follow_link(dentry, &last->cookie, nd);
                if (IS_ERR(res)) {
 out:
-                       path_put(&nd->path);
                        path_put(&last->link);
                        return res;
                }
@@ -1827,7 +1825,7 @@ Walked:
 
                        if (unlikely(IS_ERR(s))) {
                                err = PTR_ERR(s);
-                               goto Err;
+                               break;
                        }
                        err = 0;
                        if (unlikely(!s)) {
@@ -1858,7 +1856,6 @@ Walked:
                }
        }
        terminate_walk(nd);
-Err:
        while (unlikely(nd->depth))
                put_link(nd);
        return err;
@@ -1994,8 +1991,10 @@ static int trailing_symlink(struct nameidata *nd)
                return error;
        nd->flags |= LOOKUP_PARENT;
        s = get_link(nd);
-       if (unlikely(IS_ERR(s)))
+       if (unlikely(IS_ERR(s))) {
+               terminate_walk(nd);
                return PTR_ERR(s);
+       }
        if (unlikely(!s))
                return 0;
        if (*s == '/') {