From patchwork Mon May 11 18:07:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6380691 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B68AF9F399 for ; Mon, 11 May 2015 18:14:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D65EC209D0 for ; Mon, 11 May 2015 18:14:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5AC9209DA for ; Mon, 11 May 2015 18:14:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753681AbbEKSN7 (ORCPT ); Mon, 11 May 2015 14:13:59 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:47542 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755042AbbEKSI3 (ORCPT ); Mon, 11 May 2015 14:08:29 -0400 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) id 1Yrs7v-0001Vy-EV; Mon, 11 May 2015 18:08:27 +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 096/110] namei: pick_link() callers already have inode Date: Mon, 11 May 2015 19:07:56 +0100 Message-Id: <1431367690-5223-96-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 no need to refetch (and once we move unlazy out of there, recheck ->d_seq). Signed-off-by: Al Viro --- fs/namei.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index bcacb31..33b655d 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1545,7 +1545,8 @@ static void terminate_walk(struct nameidata *nd) put_link(nd); } -static int pick_link(struct nameidata *nd, struct path *link, unsigned seq) +static int pick_link(struct nameidata *nd, struct path *link, + struct inode *inode, unsigned seq) { int error; struct saved *last; @@ -1570,7 +1571,7 @@ static int pick_link(struct nameidata *nd, struct path *link, unsigned seq) last = nd->stack + nd->depth++; last->link = *link; last->cookie = NULL; - last->inode = d_backing_inode(link->dentry); + last->inode = inode; return 1; } @@ -1581,13 +1582,14 @@ static int pick_link(struct nameidata *nd, struct path *link, unsigned seq) * for the common case. */ static inline int should_follow_link(struct nameidata *nd, struct path *link, - int follow, unsigned seq) + int follow, + struct inode *inode, unsigned seq) { if (likely(!d_is_symlink(link->dentry))) return 0; if (!follow) return 0; - return pick_link(nd, link, seq); + return pick_link(nd, link, inode, seq); } enum {WALK_GET = 1, WALK_PUT = 2}; @@ -1627,7 +1629,7 @@ static int walk_component(struct nameidata *nd, int flags) if (flags & WALK_PUT) put_link(nd); - err = should_follow_link(nd, &path, flags & WALK_GET, seq); + err = should_follow_link(nd, &path, flags & WALK_GET, inode, seq); if (unlikely(err)) return err; path_to_nameidata(&path, nd); @@ -2349,7 +2351,8 @@ done: put_link(nd); path->dentry = dentry; path->mnt = nd->path.mnt; - error = should_follow_link(nd, path, nd->flags & LOOKUP_FOLLOW, 0); + error = should_follow_link(nd, path, nd->flags & LOOKUP_FOLLOW, + d_backing_inode(dentry), 0); if (unlikely(error)) return error; mntget(path->mnt); @@ -3063,7 +3066,8 @@ retry_lookup: finish_lookup: if (nd->depth) put_link(nd); - error = should_follow_link(nd, &path, nd->flags & LOOKUP_FOLLOW, seq); + error = should_follow_link(nd, &path, nd->flags & LOOKUP_FOLLOW, + inode, seq); if (unlikely(error)) return error;