link_path_walk: move the OK: inside the loop

fewer labels that way; in particular, resuming after the end of
nested symlink is straight-line.

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

1 files changed, 15 insertions, 15 deletions

diff --git a/fs/namei.c b/fs/namei.c
index 31da71753d7b..19e5c8a27ea4 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1806,11 +1806,21 @@ static int link_path_walk(const char *name, struct nameidata *nd)
                 do {
                         name++;
                 } while (unlikely(*name == '/'));
-                if (!*name)
-                        goto OK;
-
-                err = walk_component(nd, LOOKUP_FOLLOW);
-Walked:
+                if (unlikely(!*name)) {
+OK:
+                        /* called from path_init(), done */
+                        if (!nd->depth)
+                                return 0;
+                        name = nd->stack[nd->depth - 1].name;
+                        /* called from trailing_symlink(), done */
+                        if (!name)
+                                return 0;
+                        /* last component of nested symlink */
+                        err = walk_component(nd, LOOKUP_FOLLOW);
+                        put_link(nd);
+                } else {
+                        err = walk_component(nd, LOOKUP_FOLLOW);
+                }
                 if (err < 0)
                         break;
 
@@ -1859,16 +1869,6 @@ Walked:
         }
         terminate_walk(nd);
         return err;
-OK:
-        if (!nd->depth)         /* called from path_init(), done */
-                return 0;
-        name = nd->stack[nd->depth - 1].name;
-        if (!name)              /* called from trailing_symlink(), done */
-                return 0;
-
-        err = walk_component(nd, LOOKUP_FOLLOW);
-        put_link(nd);
-        goto Walked;
 }
 
 static int path_init(int dfd, const struct filename *name, unsigned int flags,