[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1431367690-5223-46-git-send-email-viro@ZenIV.linux.org.uk>
Date: Mon, 11 May 2015 19:07:06 +0100
From: Al Viro <viro@...IV.linux.org.uk>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Neil Brown <neilb@...e.de>, Christoph Hellwig <hch@...radead.org>,
linux-kernel@...r.kernel.org, linux-fsdevel@...r.kernel.org
Subject: [PATCH v3 046/110] link_path_walk: cleanup - turn goto start; into continue;
From: Al Viro <viro@...iv.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@...iv.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 5b0edd3..c105107 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)) {
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists