link_path_walk: split "return from recursive call" path

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

diff --git a/fs/namei.c b/fs/namei.c
index 9844bb2f041f1b55a4a5b7818ea17c9154e35d88..5b0edd3313388016896b1a289886f85802c0763b 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1826,23 +1826,6 @@ Walked:
                                last->name = name;
                                name = s;
                                goto start;
-
-back:
-                               name = last->name;
-                               if (unlikely(err)) {
-                                       put_link(nd, &last->link, last->cookie);
-                                       current->link_count--;
-                                       nd->depth--;
-                                       last--;
-                                       goto Err;
-                               } else {
-                                       err = walk_component(nd, LOOKUP_FOLLOW);
-                                       put_link(nd, &last->link, last->cookie);
-                                       current->link_count--;
-                                       nd->depth--;
-                                       last--;
-                                       goto Walked;
-                               }
                        }
                }
                if (!d_can_lookup(nd->path.dentry)) {
@@ -1852,13 +1835,24 @@ back:
        }
        terminate_walk(nd);
 Err:
-       if (likely(!nd->depth))
-               return err;
-       goto back;
+       while (unlikely(nd->depth)) {
+               put_link(nd, &last->link, last->cookie);
+               current->link_count--;
+               nd->depth--;
+               last--;
+       }
+       return err;
 OK:
-       if (likely(!nd->depth))
-               return 0;
-       goto back;
+       if (unlikely(nd->depth)) {
+               name = last->name;
+               err = walk_component(nd, LOOKUP_FOLLOW);
+               put_link(nd, &last->link, last->cookie);
+               current->link_count--;
+               nd->depth--;
+               last--;
+               goto Walked;
+       }
+       return 0;
 }
 
 static int path_init(int dfd, const struct filename *name, unsigned int flags,