Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755565AbbDTSRp (ORCPT ); Mon, 20 Apr 2015 14:17:45 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:34747 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754028AbbDTSNL (ORCPT ); Mon, 20 Apr 2015 14:13:11 -0400 From: Al Viro To: Linus Torvalds Cc: Neil Brown , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 11/24] link_path_walk: don't bother with walk_component() after jumping link Date: Mon, 20 Apr 2015 19:12:55 +0100 Message-Id: <1429553588-24764-11-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20150420181222.GK889@ZenIV.linux.org.uk> References: <20150420181222.GK889@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1284 Lines: 46 From: Al Viro ... it does nothing if nd->last_type is LAST_BIND. Signed-off-by: Al Viro --- fs/namei.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 6e6630c..5366b6d 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1854,7 +1854,11 @@ static int link_path_walk(const char *name, struct nameidata *nd) return err; } err = 0; - if (likely(s)) { + if (unlikely(!s)) { + /* jumped */ + put_link(nd, &link, cookie); + break; + } else { if (*s == '/') { if (!nd->root.mnt) set_root(nd); @@ -1869,9 +1873,9 @@ static int link_path_walk(const char *name, struct nameidata *nd) put_link(nd, &link, cookie); break; } + err = walk_component(nd, &next, LOOKUP_FOLLOW); + put_link(nd, &link, cookie); } - err = walk_component(nd, &next, LOOKUP_FOLLOW); - put_link(nd, &link, cookie); } while (err > 0); nd->link_count--; -- 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/