From patchwork Tue May 5 05:22:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6334111 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 078A3BEEE1 for ; Tue, 5 May 2015 05:24:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 27FA820256 for ; Tue, 5 May 2015 05:24:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3027E202C8 for ; Tue, 5 May 2015 05:24:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932502AbbEEFYa (ORCPT ); Tue, 5 May 2015 01:24:30 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:40118 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755794AbbEEFXw (ORCPT ); Tue, 5 May 2015 01:23:52 -0400 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) id 1YpVJs-0001MD-OK; 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 47/79] namei: move link/cookie pairs into nameidata Date: Tue, 5 May 2015 06:22:21 +0100 Message-Id: <1430803373-4948-47-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 Array of MAX_NESTED_LINKS + 1 elements put into nameidata; what used to be a local array in link_path_walk() occupies entries 1 .. MAX_NESTED_LINKS in it, link and cookie from the trailing symlink handling loops - entry 0. This is _not_ the final arrangement; just an easily verified incremental step. Signed-off-by: Al Viro --- fs/namei.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 38ff968..e6d54ec 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -505,6 +505,11 @@ struct nameidata { int last_type; unsigned depth; struct file *base; + struct saved { + struct path link; + void *cookie; + const char *name; + } stack[MAX_NESTED_LINKS + 1]; }; /* @@ -1703,11 +1708,7 @@ static inline u64 hash_name(const char *name) */ static int link_path_walk(const char *name, struct nameidata *nd) { - struct saved { - struct path link; - void *cookie; - const char *name; - } stack[MAX_NESTED_LINKS], *last = stack + nd->depth - 1; + struct saved *last = nd->stack; int err; while (*name=='/') @@ -2022,13 +2023,13 @@ static int path_lookupat(int dfd, const struct filename *name, if (!err && !(flags & LOOKUP_PARENT)) { err = lookup_last(nd); while (err > 0) { - void *cookie; - struct path link = nd->link; - err = trailing_symlink(&link, nd, &cookie); + nd->stack[0].link = nd->link; + err = trailing_symlink(&nd->stack[0].link, + nd, &nd->stack[0].cookie); if (err) break; err = lookup_last(nd); - put_link(nd, &link, cookie); + put_link(nd, &nd->stack[0].link, nd->stack[0].cookie); } } @@ -2368,13 +2369,13 @@ path_mountpoint(int dfd, const struct filename *name, struct path *path, err = mountpoint_last(nd, path); while (err > 0) { - void *cookie; - struct path link = *path; - err = trailing_symlink(&link, nd, &cookie); + nd->stack[0].link = nd->link; + err = trailing_symlink(&nd->stack[0].link, + nd, &nd->stack[0].cookie); if (err) break; err = mountpoint_last(nd, path); - put_link(nd, &link, cookie); + put_link(nd, &nd->stack[0].link, nd->stack[0].cookie); } out: path_cleanup(nd); @@ -3253,14 +3254,14 @@ static struct file *path_openat(int dfd, struct filename *pathname, error = do_last(nd, file, op, &opened, pathname); while (unlikely(error > 0)) { /* trailing symlink */ - struct path link = nd->link; - void *cookie; nd->flags &= ~(LOOKUP_OPEN|LOOKUP_CREATE|LOOKUP_EXCL); - error = trailing_symlink(&link, nd, &cookie); + nd->stack[0].link = nd->link; + error= trailing_symlink(&nd->stack[0].link, + nd, &nd->stack[0].cookie); if (unlikely(error)) break; error = do_last(nd, file, op, &opened, pathname); - put_link(nd, &link, cookie); + put_link(nd, &nd->stack[0].link, nd->stack[0].cookie); } out: path_cleanup(nd);