From patchwork Mon May 11 18:07:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6381671 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 2DDE39F374 for ; Mon, 11 May 2015 18:30:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5FA2E20A8C for ; Mon, 11 May 2015 18:30:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69BED20A81 for ; Mon, 11 May 2015 18:30:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932156AbbEKS1q (ORCPT ); Mon, 11 May 2015 14:27:46 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:47272 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754978AbbEKSIX (ORCPT ); Mon, 11 May 2015 14:08:23 -0400 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) id 1Yrs7o-0001SR-Vp; Mon, 11 May 2015 18:08:21 +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 062/110] link_path_walk: end of nd->depth massage Date: Mon, 11 May 2015 19:07:22 +0100 Message-Id: <1431367690-5223-62-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 get rid of orig_depth - we only use it on error exit to tell whether to stop doing put_link() when depth reaches 0 (call from path_init()) or when it reaches 1 (call from trailing_symlink()). However, in the latter case the caller would immediately follow with one more put_link(). Just keep doing it until the depth reaches zero (and simplify trailing_symlink() as the result). Signed-off-by: Al Viro --- fs/namei.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 6febe25..d12b16c 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1759,7 +1759,6 @@ static inline u64 hash_name(const char *name) static int link_path_walk(const char *name, struct nameidata *nd) { int err; - int orig_depth = nd->depth; while (*name=='/') name++; @@ -1868,7 +1867,7 @@ Walked: } terminate_walk(nd); Err: - while (unlikely(nd->depth > orig_depth)) + while (unlikely(nd->depth)) put_link(nd); return err; OK: @@ -2017,10 +2016,7 @@ static int trailing_symlink(struct nameidata *nd) } nd->inode = nd->path.dentry->d_inode; nd->stack[0].name = NULL; - error = link_path_walk(s, nd); - if (unlikely(error)) - put_link(nd); - return error; + return link_path_walk(s, nd); } static inline int lookup_last(struct nameidata *nd)