From patchwork Tue May 5 05:22:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6334151 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7E60A9F374 for ; Tue, 5 May 2015 05:24:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B77F820256 for ; Tue, 5 May 2015 05:24:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B6AB5202BE for ; Tue, 5 May 2015 05:24:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932425AbbEEFYk (ORCPT ); Tue, 5 May 2015 01:24:40 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:40114 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755789AbbEEFXw (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 1YpVJu-0001My-8n; 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 55/79] link_path_walk: nd->depth massage, part 4 Date: Tue, 5 May 2015 06:22:29 +0100 Message-Id: <1430803373-4948-55-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 lift increment/decrement into link_path_walk() callers. Signed-off-by: Al Viro --- fs/namei.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 0d1fcaf..800cf7e 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1755,7 +1755,6 @@ 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; @@ -1865,7 +1864,6 @@ Err: nd->depth--; put_link(nd); } - nd->depth--; return err; OK: if (unlikely(nd->depth > 1)) { @@ -1875,7 +1873,6 @@ OK: put_link(nd); goto Walked; } - nd->depth--; return 0; } @@ -1978,7 +1975,10 @@ static int path_init(int dfd, const struct filename *name, unsigned int flags, return -ECHILD; done: current->total_link_count = 0; - return link_path_walk(s, nd); + nd->depth++; + retval = link_path_walk(s, nd); + nd->depth--; + return retval; } static void path_cleanup(struct nameidata *nd) @@ -2012,7 +2012,9 @@ static int trailing_symlink(struct nameidata *nd) nd->flags |= LOOKUP_JUMPED; } nd->inode = nd->path.dentry->d_inode; + nd->depth++; error = link_path_walk(s, nd); + nd->depth--; if (unlikely(error)) put_link(nd); return error;