From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52988C3F2CD for ; Sun, 1 Mar 2020 21:53:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 27AF620CC7 for ; Sun, 1 Mar 2020 21:53:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727518AbgCAVx5 (ORCPT ); Sun, 1 Mar 2020 16:53:57 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:41702 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727138AbgCAVws (ORCPT ); Sun, 1 Mar 2020 16:52:48 -0500 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1j8WVy-003fPh-V4; Sun, 01 Mar 2020 21:52:47 +0000 From: Al Viro To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Linus Torvalds Subject: [RFC][PATCH v3 41/55] follow_dotdot(): expand the call of path_parent_directory() Date: Sun, 1 Mar 2020 21:52:26 +0000 Message-Id: <20200301215240.873899-41-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200301215240.873899-1-viro@ZenIV.linux.org.uk> References: <20200301215125.GA873525@ZenIV.linux.org.uk> <20200301215240.873899-1-viro@ZenIV.linux.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Al Viro ... and move the definition of path_parent_directory() towards the last remaining user. Signed-off-by: Al Viro --- fs/namei.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 8e588632e03a..9b66cd00edcb 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1440,21 +1440,8 @@ static void follow_mount(struct path *path) } } -static struct dentry *path_parent_directory(struct path *path) -{ - /* rare case of legitimate dget_parent()... */ - struct dentry *parent = dget_parent(path->dentry); - - if (unlikely(!path_connected(path->mnt, parent))) { - dput(parent); - parent = NULL; - } - return parent; -} - static int follow_dotdot(struct nameidata *nd) { - struct dentry *parent; while (1) { if (path_equal(&nd->path, &nd->root)) { if (unlikely(nd->flags & LOOKUP_BENEATH)) @@ -1462,9 +1449,13 @@ static int follow_dotdot(struct nameidata *nd) break; } if (nd->path.dentry != nd->path.mnt->mnt_root) { - parent = path_parent_directory(&nd->path); - if (!parent) + /* rare case of legitimate dget_parent()... */ + struct dentry *parent = dget_parent(nd->path.dentry); + + if (unlikely(!path_connected(nd->path.mnt, parent))) { + dput(parent); return -ENOENT; + } dput(nd->path.dentry); nd->path.dentry = parent; break; @@ -2600,6 +2591,17 @@ struct dentry *lookup_positive_unlocked(const char *name, EXPORT_SYMBOL(lookup_positive_unlocked); #ifdef CONFIG_UNIX98_PTYS +static int path_parent_directory(struct path *path) +{ + struct dentry *old = path->dentry; + /* rare case of legitimate dget_parent()... */ + path->dentry = dget_parent(path->dentry); + dput(old); + if (unlikely(!path_connected(path->mnt, path->dentry))) + return -ENOENT; + return 0; +} + int path_pts(struct path *path) { /* Find something mounted on "pts" in the same directory as @@ -2607,13 +2609,13 @@ int path_pts(struct path *path) */ struct dentry *child, *parent; struct qstr this; + int ret; - parent = path_parent_directory(path); - if (!parent) - return -ENOENT; + ret = path_parent_directory(path); + if (ret) + return ret; - dput(path->dentry); - path->dentry = parent; + parent = path->dentry; this.name = "pts"; this.len = 3; child = d_hash_and_lookup(parent, &this); -- 2.11.0