Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965468AbbEEFc4 (ORCPT ); Tue, 5 May 2015 01:32:56 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:40077 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755637AbbEEFXI (ORCPT ); Tue, 5 May 2015 01:23:08 -0400 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 75/79] namei: simplify the callers of follow_managed() Date: Tue, 5 May 2015 06:22:49 +0100 Message-Id: <1430803373-4948-75-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: 2327 Lines: 90 From: Al Viro now that it gets nameidata, no reason to have setting LOOKUP_JUMPED on mountpoint crossing and calling path_put_conditional() on failures done in every caller. Signed-off-by: Al Viro --- fs/namei.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 5ac1079..c9c313c 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1118,7 +1118,11 @@ static int follow_managed(struct path *path, struct nameidata *nd) mntput(path->mnt); if (ret == -EISDIR) ret = 0; - return ret < 0 ? ret : need_mntput; + if (need_mntput) + nd->flags |= LOOKUP_JUMPED; + if (unlikely(ret < 0)) + path_put_conditional(path, nd); + return ret; } int follow_down_one(struct path *path) @@ -1486,14 +1490,9 @@ unlazy: path->mnt = mnt; path->dentry = dentry; err = follow_managed(path, nd); - if (unlikely(err < 0)) { - path_put_conditional(path, nd); - return err; - } - if (err) - nd->flags |= LOOKUP_JUMPED; - *inode = path->dentry->d_inode; - return 0; + if (likely(!err)) + *inode = path->dentry->d_inode; + return err; need_lookup: return 1; @@ -1503,7 +1502,6 @@ need_lookup: static int lookup_slow(struct nameidata *nd, struct path *path) { struct dentry *dentry, *parent; - int err; parent = nd->path.dentry; BUG_ON(nd->inode != parent->d_inode); @@ -1515,14 +1513,7 @@ static int lookup_slow(struct nameidata *nd, struct path *path) return PTR_ERR(dentry); path->mnt = nd->path.mnt; path->dentry = dentry; - err = follow_managed(path, nd); - if (unlikely(err < 0)) { - path_put_conditional(path, nd); - return err; - } - if (err) - nd->flags |= LOOKUP_JUMPED; - return 0; + return follow_managed(path, nd); } static inline int may_lookup(struct nameidata *nd) @@ -3090,10 +3081,7 @@ retry_lookup: error = follow_managed(&path, nd); if (error < 0) - goto exit_dput; - - if (error) - nd->flags |= LOOKUP_JUMPED; + goto out; BUG_ON(nd->flags & LOOKUP_RCU); inode = path.dentry->d_inode; -- 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/