[PATCH 12/24] link_path_walk: turn inner loop into explicit goto

Al Viro
2015-04-20T18:17:42Z

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

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

diff --git a/fs/namei.c b/fs/namei.c
index 5366b6d..86d54e5 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1832,6 +1832,10 @@ static int link_path_walk(const char *name, struct nameidata *nd)
return err;

if (err) {
+ struct path link;
+ void *cookie;
+ char *s;
+
if (unlikely(nd->link_count >= MAX_NESTED_LINKS)) {
path_put_conditional(&next, nd);
path_put(&nd->path);
@@ -1842,41 +1846,40 @@ static int link_path_walk(const char *name, struct nameidata *nd)
nd->depth++;
nd->link_count++;

- do {
- struct path link = next;
- void *cookie;
- char *s = get_link(&link, nd, &cookie);
-
- if (unlikely(IS_ERR(s))) {
- err = PTR_ERR(s);
- nd->link_count--;
- nd->depth--;
- return err;
+l:
+ link = next;
+ s = get_link(&link, nd, &cookie);
+
+ if (unlikely(IS_ERR(s))) {
+ err = PTR_ERR(s);
+ nd->link_count--;
+ nd->depth--;
+ return err;
+ }
+ err = 0;
+ if (unlikely(!s)) {
+ /* jumped */
+ put_link(nd, &link, cookie);
+ } else {
+ if (*s == '/') {
+ if (!nd->root.mnt)
+ set_root(nd);
+ path_put(&nd->path);
+ nd->path = nd->root;
+ path_get(&nd->root);
+ nd->flags |= LOOKUP_JUMPED;
}
- err = 0;
- if (unlikely(!s)) {
- /* jumped */
+ nd->inode = nd->path.dentry->d_inode;
+ err = link_path_walk(s, nd);
+ if (unlikely(err)) {
put_link(nd, &link, cookie);
- break;
} else {
- if (*s == '/') {
- if (!nd->root.mnt)
- set_root(nd);
- path_put(&nd->path);
- nd->path = nd->root;
- path_get(&nd->root);
- nd->flags |= LOOKUP_JUMPED;
- }
- nd->inode = nd->path.dentry->d_inode;
- err = link_path_walk(s, nd);
- if (unlikely(err)) {
- put_link(nd, &link, cookie);
- break;
- }
err = walk_component(nd, &next, LOOKUP_FOLLOW);
put_link(nd, &link, cookie);
+ if (err > 0)
+ goto l;
}
- } while (err > 0);
+ }

nd->link_count--;
nd->depth--;
--
2.1.4