From patchwork Tue May 5 05:22:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6335161 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 E8276BEEE1 for ; Tue, 5 May 2015 05:40:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1966F202BE for ; Tue, 5 May 2015 05:40:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25E2A201F4 for ; Tue, 5 May 2015 05:40:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030493AbbEEFkb (ORCPT ); Tue, 5 May 2015 01:40:31 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:39846 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755602AbbEEFXE (ORCPT ); Tue, 5 May 2015 01:23:04 -0400 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) id 1YpVJs-0001MK-Sv; Tue, 05 May 2015 05:23:00 +0000 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 48/79] namei: trim redundant arguments of trailing_symlink() Date: Tue, 5 May 2015 06:22:22 +0100 Message-Id: <1430803373-4948-48-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 Signed-off-by: Al Viro --- fs/namei.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index e6d54ec..22256ef 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1963,14 +1963,15 @@ static void path_cleanup(struct nameidata *nd) fput(nd->base); } -static int trailing_symlink(struct path *link, struct nameidata *nd, void **p) +static int trailing_symlink(struct nameidata *nd) { const char *s; - int error = may_follow_link(link, nd); + int error = may_follow_link(&nd->link, nd); if (unlikely(error)) return error; nd->flags |= LOOKUP_PARENT; - s = get_link(link, nd, p); + nd->stack[0].link = nd->link; + s = get_link(&nd->stack[0].link, nd, &nd->stack[0].cookie); if (unlikely(IS_ERR(s))) return PTR_ERR(s); if (unlikely(!s)) @@ -1986,7 +1987,7 @@ static int trailing_symlink(struct path *link, struct nameidata *nd, void **p) nd->inode = nd->path.dentry->d_inode; error = link_path_walk(s, nd); if (unlikely(error)) - put_link(nd, link, *p); + put_link(nd, &nd->stack[0].link, nd->stack[0].cookie); return error; } @@ -2023,9 +2024,7 @@ static int path_lookupat(int dfd, const struct filename *name, if (!err && !(flags & LOOKUP_PARENT)) { err = lookup_last(nd); while (err > 0) { - nd->stack[0].link = nd->link; - err = trailing_symlink(&nd->stack[0].link, - nd, &nd->stack[0].cookie); + err = trailing_symlink(nd); if (err) break; err = lookup_last(nd); @@ -2369,9 +2368,7 @@ path_mountpoint(int dfd, const struct filename *name, struct path *path, err = mountpoint_last(nd, path); while (err > 0) { - nd->stack[0].link = nd->link; - err = trailing_symlink(&nd->stack[0].link, - nd, &nd->stack[0].cookie); + err = trailing_symlink(nd); if (err) break; err = mountpoint_last(nd, path); @@ -3255,9 +3252,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, error = do_last(nd, file, op, &opened, pathname); while (unlikely(error > 0)) { /* trailing symlink */ nd->flags &= ~(LOOKUP_OPEN|LOOKUP_CREATE|LOOKUP_EXCL); - nd->stack[0].link = nd->link; - error= trailing_symlink(&nd->stack[0].link, - nd, &nd->stack[0].cookie); + error = trailing_symlink(nd); if (unlikely(error)) break; error = do_last(nd, file, op, &opened, pathname);