From patchwork Mon Apr 20 18:13:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6243471 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 7DA80BF4A6 for ; Mon, 20 Apr 2015 18:16:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B86C620445 for ; Mon, 20 Apr 2015 18:16:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD4B920421 for ; Mon, 20 Apr 2015 18:16:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754995AbbDTSOh (ORCPT ); Mon, 20 Apr 2015 14:14:37 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:34767 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754181AbbDTSNM (ORCPT ); Mon, 20 Apr 2015 14:13:12 -0400 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) id 1YkGBy-0006T5-Ln; 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 17/24] link_path_walk: split "return from recursive call" path Date: Mon, 20 Apr 2015 19:13:01 +0100 Message-Id: <1429553588-24764-17-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 Signed-off-by: Al Viro --- fs/namei.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 4b98f4b..975918f 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1883,23 +1883,6 @@ Walked: last->name = name; name = s; goto start; - -back: - name = last->name; - if (unlikely(err)) { - put_link(nd, &last->link, last->cookie); - nd->link_count--; - nd->depth--; - last--; - goto Err; - } else { - err = walk_component(nd, &next, LOOKUP_FOLLOW); - put_link(nd, &last->link, last->cookie); - nd->link_count--; - nd->depth--; - last--; - goto Walked; - } } } if (!d_can_lookup(nd->path.dentry)) { @@ -1909,13 +1892,24 @@ back: } terminate_walk(nd); Err: - if (likely(!nd->depth)) - return err; - goto back; + while (unlikely(nd->depth)) { + put_link(nd, &last->link, last->cookie); + nd->link_count--; + nd->depth--; + last--; + } + return err; OK: - if (likely(!nd->depth)) - return 0; - goto back; + if (unlikely(nd->depth)) { + name = last->name; + err = walk_component(nd, &next, LOOKUP_FOLLOW); + put_link(nd, &last->link, last->cookie); + nd->link_count--; + nd->depth--; + last--; + goto Walked; + } + return 0; } static int path_init(int dfd, const struct filename *name, unsigned int flags,