Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755531AbbEKSYj (ORCPT ); Mon, 11 May 2015 14:24:39 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:47338 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754992AbbEKSIY (ORCPT ); Mon, 11 May 2015 14:08:24 -0400 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3 069/110] link_path_walk: move the OK: inside the loop Date: Mon, 11 May 2015 19:07:29 +0100 Message-Id: <1431367690-5223-69-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20150511180650.GA4147@ZenIV.linux.org.uk> References: <20150511180650.GA4147@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1717 Lines: 66 From: Al Viro fewer labels that way; in particular, resuming after the end of nested symlink is straight-line. Signed-off-by: Al Viro --- fs/namei.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 31da717..19e5c8a 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1806,11 +1806,21 @@ static int link_path_walk(const char *name, struct nameidata *nd) do { name++; } while (unlikely(*name == '/')); - if (!*name) - goto OK; - - err = walk_component(nd, LOOKUP_FOLLOW); -Walked: + if (unlikely(!*name)) { +OK: + /* called from path_init(), done */ + if (!nd->depth) + return 0; + name = nd->stack[nd->depth - 1].name; + /* called from trailing_symlink(), done */ + if (!name) + return 0; + /* last component of nested symlink */ + err = walk_component(nd, LOOKUP_FOLLOW); + put_link(nd); + } else { + err = walk_component(nd, LOOKUP_FOLLOW); + } if (err < 0) break; @@ -1859,16 +1869,6 @@ Walked: } terminate_walk(nd); return err; -OK: - if (!nd->depth) /* called from path_init(), done */ - return 0; - name = nd->stack[nd->depth - 1].name; - if (!name) /* called from trailing_symlink(), done */ - return 0; - - err = walk_component(nd, LOOKUP_FOLLOW); - put_link(nd); - goto Walked; } 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/