From patchwork Mon May 11 18:07:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6381811 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 3E5FEBEEE1 for ; Mon, 11 May 2015 18:32:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5F89020A8F for ; Mon, 11 May 2015 18:32:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C52A20A81 for ; Mon, 11 May 2015 18:32:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932292AbbEKSaV (ORCPT ); Mon, 11 May 2015 14:30:21 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:47195 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753855AbbEKSIV (ORCPT ); Mon, 11 May 2015 14:08:21 -0400 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) id 1Yrs7n-0001RV-7P; Mon, 11 May 2015 18:08:19 +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 052/110] link_path_walk: nd->depth massage, part 1 Date: Mon, 11 May 2015 19:07:12 +0100 Message-Id: <1431367690-5223-52-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 nd->stack[0] is unused until the handling of trailing symlinks and we want to get rid of that. Having fucked that transformation up several times, I went for bloody pedantic series of provably equivalent transformations. Sorry. Step 1: keep nd->depth higher by one in link_path_walk() - increment upon entry, decrement on exits, adjust the arithmetics inside and surround the calls of functions that care about nd->depth value (nd_alloc_stack(), get_link(), put_link()) with decrement/increment pairs. Signed-off-by: Al Viro --- fs/namei.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 1ae34cd..e408f4d 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1763,6 +1763,7 @@ static int link_path_walk(const char *name, struct nameidata *nd) if (!*name) return 0; + nd->depth++; /* At this point we know we have a real path component. */ for(;;) { u64 hash_len; @@ -1823,15 +1824,18 @@ Walked: if (err) { const char *s; + nd->depth--; err = nd_alloc_stack(nd); + nd->depth++; if (unlikely(err)) { path_to_nameidata(&nd->link, nd); break; } nd->depth++; - + nd->depth--; s = get_link(nd); + nd->depth++; if (unlikely(IS_ERR(s))) { err = PTR_ERR(s); @@ -1841,7 +1845,9 @@ Walked: err = 0; if (unlikely(!s)) { /* jumped */ + nd->depth--; put_link(nd); + nd->depth++; nd->depth--; } else { if (*s == '/') { @@ -1855,7 +1861,7 @@ Walked: ; } nd->inode = nd->path.dentry->d_inode; - nd->stack[nd->depth].name = name; + nd->stack[nd->depth - 1].name = name; if (!*s) goto OK; name = s; @@ -1869,19 +1875,25 @@ Walked: } terminate_walk(nd); Err: - while (unlikely(nd->depth)) { + while (unlikely(nd->depth > 1)) { + nd->depth--; put_link(nd); + nd->depth++; nd->depth--; } + nd->depth--; return err; OK: - if (unlikely(nd->depth)) { - name = nd->stack[nd->depth].name; + if (unlikely(nd->depth > 1)) { + name = nd->stack[nd->depth - 1].name; err = walk_component(nd, LOOKUP_FOLLOW); + nd->depth--; put_link(nd); + nd->depth++; nd->depth--; goto Walked; } + nd->depth--; return 0; }