From patchwork Tue May 5 05:22:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6334161 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 310DC9F373 for ; Tue, 5 May 2015 05:24:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BD7F720256 for ; Tue, 5 May 2015 05:24:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9C8820266 for ; Tue, 5 May 2015 05:24:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932833AbbEEFYn (ORCPT ); Tue, 5 May 2015 01:24:43 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:40113 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755788AbbEEFXw (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 1YpVJr-0001Lo-RV; Tue, 05 May 2015 05:22:59 +0000 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 43/79] link_path_walk: final preparations to killing recursion Date: Tue, 5 May 2015 06:22:17 +0100 Message-Id: <1430803373-4948-43-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 reduce the number of returns in there - turn all places where it returns zero into goto OK and places where it returns non-zero into goto Err. The only non-trivial detail is that all breaks in the loop are guaranteed to be with non-zero err. Signed-off-by: Al Viro --- fs/namei.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index b740f6f..ac73d9e 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1708,7 +1708,7 @@ static int link_path_walk(const char *name, struct nameidata *nd) while (*name=='/') name++; if (!*name) - return 0; + goto OK; /* At this point we know we have a real path component. */ for(;;) { @@ -1751,7 +1751,7 @@ static int link_path_walk(const char *name, struct nameidata *nd) name += hashlen_len(hash_len); if (!*name) - return 0; + goto OK; /* * If it wasn't NUL, we know it was '/'. Skip that * slash, and continue until no more slashes. @@ -1760,12 +1760,12 @@ static int link_path_walk(const char *name, struct nameidata *nd) name++; } while (unlikely(*name == '/')); if (!*name) - return 0; + goto OK; err = walk_component(nd, LOOKUP_FOLLOW); Walked: if (err < 0) - return err; + goto Err; if (err) { struct path link; @@ -1775,7 +1775,8 @@ Walked: if (unlikely(current->link_count >= MAX_NESTED_LINKS)) { path_put_conditional(&nd->link, nd); path_put(&nd->path); - return -ELOOP; + err = -ELOOP; + goto Err; } BUG_ON(nd->depth >= MAX_NESTED_LINKS); @@ -1789,7 +1790,7 @@ Walked: err = PTR_ERR(s); current->link_count--; nd->depth--; - return err; + goto Err; } err = 0; if (unlikely(!s)) { @@ -1812,7 +1813,7 @@ Walked: put_link(nd, &link, cookie); current->link_count--; nd->depth--; - return err; + goto Err; } else { err = walk_component(nd, LOOKUP_FOLLOW); put_link(nd, &link, cookie); @@ -1828,7 +1829,10 @@ Walked: } } terminate_walk(nd); +Err: return err; +OK: + return 0; } static int path_init(int dfd, const struct filename *name, unsigned int flags,