From: Al Viro Date: Sun, 19 Apr 2015 00:44:34 +0000 (-0400) Subject: link_path_walk: cleanup - turn goto start; into continue; X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9e18f10a30e0c49520fbda39751fcae760445b96;p=openwrt%2Fstaging%2Fblogic.git link_path_walk: cleanup - turn goto start; into continue; 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 --- diff --git a/fs/namei.c b/fs/namei.c index 5b0edd331338..c105107ddf8f 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1718,11 +1718,10 @@ static int link_path_walk(const char *name, struct nameidata *nd) } stack[MAX_NESTED_LINKS], *last = stack + nd->depth - 1; int err; -start: while (*name=='/') name++; if (!*name) - goto OK; + return 0; /* At this point we know we have a real path component. */ for(;;) { @@ -1821,11 +1820,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)) {