From patchwork Tue May 5 05:22:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6335191 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 5A426BEEE1 for ; Tue, 5 May 2015 05:40:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 81A3A2027D for ; Tue, 5 May 2015 05:40:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A782201F4 for ; Tue, 5 May 2015 05:40:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030531AbbEEFkq (ORCPT ); Tue, 5 May 2015 01:40:46 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:39764 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755587AbbEEFXB (ORCPT ); Tue, 5 May 2015 01:23:01 -0400 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) id 1YpVJq-0001L8-Lm; Tue, 05 May 2015 05:22:58 +0000 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 35/79] namei: expand the call of follow_link() in link_path_walk() Date: Tue, 5 May 2015 06:22:09 +0100 Message-Id: <1430803373-4948-35-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-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 ... and strip __always_inline from follow_link() - remaining callers don't need that. Now link_path_walk() recursion is a direct one. Signed-off-by: Al Viro --- fs/namei.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index fae70a4..2243d18 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -880,8 +880,7 @@ out: return res; } -static __always_inline int -follow_link(struct path *link, struct nameidata *nd, void **p) +static int follow_link(struct path *link, struct nameidata *nd, void **p) { const char *s = get_link(link, nd, p); int error; @@ -1807,10 +1806,29 @@ static int link_path_walk(const char *name, struct nameidata *nd) do { struct path link = nd->link; void *cookie; + const char *s = get_link(&link, nd, &cookie); - err = follow_link(&link, nd, &cookie); - if (err) + if (unlikely(IS_ERR(s))) { + err = PTR_ERR(s); break; + } + err = 0; + if (likely(s)) { + if (*s == '/') { + if (!nd->root.mnt) + set_root(nd); + path_put(&nd->path); + nd->path = nd->root; + path_get(&nd->root); + nd->flags |= LOOKUP_JUMPED; + } + nd->inode = nd->path.dentry->d_inode; + err = link_path_walk(s, nd); + if (unlikely(err)) { + put_link(nd, &link, cookie); + break; + } + } err = walk_component(nd, LOOKUP_FOLLOW); put_link(nd, &link, cookie); } while (err > 0);