Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030303AbbEEFgQ (ORCPT ); Tue, 5 May 2015 01:36:16 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:39969 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755617AbbEEFXG (ORCPT ); Tue, 5 May 2015 01:23:06 -0400 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 60/79] link_path_walk: nd->depth massage, part 9 Date: Tue, 5 May 2015 06:22:34 +0100 Message-Id: <1430803373-4948-60-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: 1604 Lines: 57 From: Al Viro Make link_path_walk() work with any value of nd->depth on entry - memorize it and use it in tests instead of comparing with 1. Don't bother with increment/decrement in path_init(). Signed-off-by: Al Viro --- fs/namei.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 0713961..10cb0be 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1751,6 +1751,7 @@ static inline u64 hash_name(const char *name) static int link_path_walk(const char *name, struct nameidata *nd) { int err; + int orig_depth = nd->depth; while (*name=='/') name++; @@ -1859,11 +1860,11 @@ Walked: } terminate_walk(nd); Err: - while (unlikely(nd->depth > 1)) + while (unlikely(nd->depth > orig_depth)) put_link(nd); return err; OK: - if (unlikely(nd->depth > 1)) { + if (unlikely(nd->depth > orig_depth)) { name = nd->stack[nd->depth - 1].name; err = walk_component(nd, LOOKUP_FOLLOW); put_link(nd); @@ -1971,10 +1972,7 @@ static int path_init(int dfd, const struct filename *name, unsigned int flags, return -ECHILD; done: current->total_link_count = 0; - nd->depth++; - retval = link_path_walk(s, nd); - nd->depth--; - return retval; + return link_path_walk(s, nd); } static void path_cleanup(struct nameidata *nd) -- 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/