From patchwork Mon May 11 18:07:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6381491 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 52358BEEE1 for ; Mon, 11 May 2015 18:27:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E59220A82 for ; Mon, 11 May 2015 18:27:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F37F420A81 for ; Mon, 11 May 2015 18:27:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754798AbbEKS0C (ORCPT ); Mon, 11 May 2015 14:26:02 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:47301 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754982AbbEKSIX (ORCPT ); Mon, 11 May 2015 14:08:23 -0400 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) id 1Yrs7p-0001Sk-E4; Mon, 11 May 2015 18:08:21 +0000 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3 065/110] lift terminate_walk() into callers of walk_component() Date: Mon, 11 May 2015 19:07:25 +0100 Message-Id: <1431367690-5223-65-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-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Al Viro Signed-off-by: Al Viro --- fs/namei.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 25cd935..d99eaac 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1587,20 +1587,16 @@ 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)) { - err = handle_dots(nd, nd->last_type); - if (err) - goto out_err; - return 0; - } + if (unlikely(nd->last_type != LAST_NORM)) + return handle_dots(nd, nd->last_type); err = lookup_fast(nd, &path, &inode); if (unlikely(err)) { if (err < 0) - goto out_err; + return err; err = lookup_slow(nd, &path); if (err < 0) - goto out_err; + return err; inode = path.dentry->d_inode; err = -ENOENT; @@ -1612,8 +1608,7 @@ static int walk_component(struct nameidata *nd, int follow) if (nd->flags & LOOKUP_RCU) { if (unlikely(nd->path.mnt != path.mnt || unlazy_walk(nd, path.dentry))) { - err = -ECHILD; - goto out_err; + return -ECHILD; } } BUG_ON(inode != path.dentry->d_inode); @@ -1626,8 +1621,6 @@ static int walk_component(struct nameidata *nd, int follow) out_path_put: path_to_nameidata(&path, nd); -out_err: - terminate_walk(nd); return err; } @@ -1819,7 +1812,7 @@ static int link_path_walk(const char *name, struct nameidata *nd) err = walk_component(nd, LOOKUP_FOLLOW); Walked: if (err < 0) - goto Err; + break; if (err) { const char *s; @@ -2020,11 +2013,15 @@ static int trailing_symlink(struct nameidata *nd) static inline int lookup_last(struct nameidata *nd) { + int err; if (nd->last_type == LAST_NORM && nd->last.name[nd->last.len]) nd->flags |= LOOKUP_FOLLOW | LOOKUP_DIRECTORY; nd->flags &= ~LOOKUP_PARENT; - return walk_component(nd, nd->flags & LOOKUP_FOLLOW); + err = walk_component(nd, nd->flags & LOOKUP_FOLLOW); + if (err < 0) + terminate_walk(nd); + return err; } /* Returns 0 and nd will be valid on success; Retuns error, otherwise. */