From mboxrd@z Thu Jan 1 00:00:00 1970 From: Al Viro Subject: [PATCH 64/79] namei: lift (open-coded) terminate_walk() in follow_dotdot_rcu() into callers Date: Tue, 5 May 2015 06:22:38 +0100 Message-ID: <1430803373-4948-64-git-send-email-viro@ZenIV.linux.org.uk> References: <20150505052205.GS889@ZenIV.linux.org.uk> Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org To: Linus Torvalds Return-path: In-Reply-To: <20150505052205.GS889@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org From: Al Viro follow_dotdot_rcu() does an equivalent of terminate_walk() on failure; shifting it into callers makes for simpler rules and those callers already have terminate_walk() on other failure exits. Signed-off-by: Al Viro --- fs/namei.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index e4ca3b1..e53f146 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1230,10 +1230,6 @@ static int follow_dotdot_rcu(struct nameidata *nd) return 0; failed: - nd->flags &= ~LOOKUP_RCU; - if (!(nd->flags & LOOKUP_ROOT)) - nd->root.mnt = NULL; - rcu_read_unlock(); return -ECHILD; } @@ -1543,8 +1539,7 @@ static inline int handle_dots(struct nameidata *nd, int type) { if (type == LAST_DOTDOT) { if (nd->flags & LOOKUP_RCU) { - if (follow_dotdot_rcu(nd)) - return -ECHILD; + return follow_dotdot_rcu(nd); } else follow_dotdot(nd); } @@ -1584,8 +1579,12 @@ static int walk_component(struct nameidata *nd, int follow) * to be able to know about the current root directory and * parent relationships. */ - if (unlikely(nd->last_type != LAST_NORM)) - return handle_dots(nd, nd->last_type); + if (unlikely(nd->last_type != LAST_NORM)) { + err = handle_dots(nd, nd->last_type); + if (err) + goto out_err; + return 0; + } err = lookup_fast(nd, &path, &inode); if (unlikely(err)) { if (err < 0) @@ -2973,8 +2972,10 @@ static int do_last(struct nameidata *nd, if (nd->last_type != LAST_NORM) { error = handle_dots(nd, nd->last_type); - if (error) + if (unlikely(error)) { + terminate_walk(nd); return error; + } goto finish_open; } -- 2.1.4