From patchwork Mon Apr 20 18:12:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6243621 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 649DDBF4A6 for ; Mon, 20 Apr 2015 18:19:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9EC0320445 for ; Mon, 20 Apr 2015 18:19:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF9D620421 for ; Mon, 20 Apr 2015 18:19:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754092AbbDTSRh (ORCPT ); Mon, 20 Apr 2015 14:17:37 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:34753 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754034AbbDTSNL (ORCPT ); Mon, 20 Apr 2015 14:13:11 -0400 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) id 1YkGBx-0006Sk-WB; Mon, 20 Apr 2015 18:13:10 +0000 From: Al Viro To: Linus Torvalds Cc: Neil Brown , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 13/24] link_path_walk: massage a bit more Date: Mon, 20 Apr 2015 19:12:57 +0100 Message-Id: <1429553588-24764-13-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20150420181222.GK889@ZenIV.linux.org.uk> References: <20150420181222.GK889@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 Pull the block after the if-else in the end of what used to be do-while body into all branches there. We are almost done with the massage... Signed-off-by: Al Viro --- fs/namei.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 86d54e5..06f1aa3 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1860,6 +1860,8 @@ l: if (unlikely(!s)) { /* jumped */ put_link(nd, &link, cookie); + nd->link_count--; + nd->depth--; } else { if (*s == '/') { if (!nd->root.mnt) @@ -1873,18 +1875,23 @@ l: err = link_path_walk(s, nd); if (unlikely(err)) { put_link(nd, &link, cookie); + nd->link_count--; + nd->depth--; + return err; } else { err = walk_component(nd, &next, LOOKUP_FOLLOW); put_link(nd, &link, cookie); - if (err > 0) + nd->link_count--; + nd->depth--; + if (err < 0) + return err; + if (err > 0) { + nd->link_count++; + nd->depth++; goto l; + } } } - - nd->link_count--; - nd->depth--; - if (err) - return err; } if (!d_can_lookup(nd->path.dentry)) { err = -ENOTDIR;