Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964934AbbEEF2y (ORCPT ); Tue, 5 May 2015 01:28:54 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:40099 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755702AbbEEFX1 (ORCPT ); Tue, 5 May 2015 01:23:27 -0400 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 42/79] link_path_walk: get rid of duplication Date: Tue, 5 May 2015 06:22:16 +0100 Message-Id: <1430803373-4948-42-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: 1479 Lines: 56 From: Al Viro What we do after the second walk_component() + put_link() + depth decrement in there is exactly equivalent to what's done right after the first walk_component(). Easy to verify and not at all surprising, seeing that there we have just walked the last component of nested symlink. Signed-off-by: Al Viro --- fs/namei.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index d11165c..b740f6f 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1763,6 +1763,7 @@ static int link_path_walk(const char *name, struct nameidata *nd) return 0; err = walk_component(nd, LOOKUP_FOLLOW); +Walked: if (err < 0) return err; @@ -1781,7 +1782,6 @@ static int link_path_walk(const char *name, struct nameidata *nd) nd->depth++; current->link_count++; -l: link = nd->link; s = get_link(&link, nd, &cookie); @@ -1818,13 +1818,7 @@ l: put_link(nd, &link, cookie); current->link_count--; nd->depth--; - if (err < 0) - return err; - if (err > 0) { - current->link_count++; - nd->depth++; - goto l; - } + goto Walked; } } } -- 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/