From patchwork Tue May 5 05:22:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6334891 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 C9497BEEE1 for ; Tue, 5 May 2015 05:35:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1114F202C8 for ; Tue, 5 May 2015 05:35:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A65E2027D for ; Tue, 5 May 2015 05:35:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030215AbbEEFfZ (ORCPT ); Tue, 5 May 2015 01:35:25 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:39883 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755610AbbEEFXF (ORCPT ); Tue, 5 May 2015 01:23:05 -0400 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) id 1YpVJt-0001Mm-Tr; Tue, 05 May 2015 05:23:02 +0000 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 53/79] link_path_walk: nd->depth massage, part 2 Date: Tue, 5 May 2015 06:22:27 +0100 Message-Id: <1430803373-4948-53-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 collapse adjacent increment/decrement pairs. Signed-off-by: Al Viro --- fs/namei.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index da23835..d8ad004 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1824,8 +1824,6 @@ Walked: break; } - nd->depth++; - nd->depth--; s = get_link(nd); nd->depth++; @@ -1839,8 +1837,6 @@ Walked: /* jumped */ nd->depth--; put_link(nd); - nd->depth++; - nd->depth--; } else { if (*s == '/') { if (!nd->root.mnt) @@ -1870,8 +1866,6 @@ Err: while (unlikely(nd->depth > 1)) { nd->depth--; put_link(nd); - nd->depth++; - nd->depth--; } nd->depth--; return err; @@ -1881,8 +1875,6 @@ OK: err = walk_component(nd, LOOKUP_FOLLOW); nd->depth--; put_link(nd); - nd->depth++; - nd->depth--; goto Walked; } nd->depth--;