From mboxrd@z Thu Jan 1 00:00:00 1970 From: Al Viro Subject: [PATCH 17/24] link_path_walk: split "return from recursive call" path Date: Mon, 20 Apr 2015 19:13:01 +0100 Message-ID: <1429553588-24764-17-git-send-email-viro@ZenIV.linux.org.uk> References: <20150420181222.GK889@ZenIV.linux.org.uk> Cc: Neil Brown , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org To: Linus Torvalds Return-path: In-Reply-To: <20150420181222.GK889@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org From: Al Viro Signed-off-by: Al Viro --- fs/namei.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 4b98f4b..975918f 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1883,23 +1883,6 @@ Walked: last->name = name; name = s; goto start; - -back: - name = last->name; - if (unlikely(err)) { - put_link(nd, &last->link, last->cookie); - nd->link_count--; - nd->depth--; - last--; - goto Err; - } else { - err = walk_component(nd, &next, LOOKUP_FOLLOW); - put_link(nd, &last->link, last->cookie); - nd->link_count--; - nd->depth--; - last--; - goto Walked; - } } } if (!d_can_lookup(nd->path.dentry)) { @@ -1909,13 +1892,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); + nd->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, &next, LOOKUP_FOLLOW); + put_link(nd, &last->link, last->cookie); + nd->link_count--; + nd->depth--; + last--; + goto Walked; + } + return 0; } static int path_init(int dfd, const struct filename *name, unsigned int flags, -- 2.1.4