Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030557AbbEEFk6 (ORCPT ); Tue, 5 May 2015 01:40:58 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:39828 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755601AbbEEFXE (ORCPT ); Tue, 5 May 2015 01:23:04 -0400 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 45/79] link_path_walk: split "return from recursive call" path Date: Tue, 5 May 2015 06:22:19 +0100 Message-Id: <1430803373-4948-45-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20150505052205.GS889@ZenIV.linux.org.uk> References: <20150505052205.GS889@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1709 Lines: 74 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 3c622ad..723dead 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1818,23 +1818,6 @@ Walked: last->name = name; name = s; goto start; - -back: - name = last->name; - if (unlikely(err)) { - put_link(nd, &last->link, last->cookie); - current->link_count--; - nd->depth--; - last--; - goto Err; - } else { - err = walk_component(nd, LOOKUP_FOLLOW); - put_link(nd, &last->link, last->cookie); - current->link_count--; - nd->depth--; - last--; - goto Walked; - } } } if (!d_can_lookup(nd->path.dentry)) { @@ -1844,13 +1827,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); + current->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, LOOKUP_FOLLOW); + put_link(nd, &last->link, last->cookie); + current->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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/