[PATCH 18/24] link_path_walk: cleanup - turn goto start; into continue;

Al Viro
2015-04-20T18:14:41Z

From: Al Viro <viro@zeniv.linux.org.uk>

Deal with skipping leading slashes before what used to be the
recursive call. That way we can get rid of that goto completely.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/namei.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 975918f..71c9546 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1775,11 +1775,10 @@ static int link_path_walk(const char *name, struct nameidata *nd)
struct path next;
int err;

-start:
while (*name=='/')
name++;
if (!*name)
- goto OK;
+ return 0;

/* At this point we know we have a real path component. */
for(;;) {
@@ -1878,11 +1877,15 @@ Walked:
nd->path = nd->root;
path_get(&nd->root);
nd->flags |= LOOKUP_JUMPED;
+ while (unlikely(*++s == '/'))
+ ;
}
nd->inode = nd->path.dentry->d_inode;
last->name = name;
+ if (!*s)
+ goto OK;
name = s;
- goto start;
+ continue;
}
}
if (!d_can_lookup(nd->path.dentry)) {
--
2.1.4