From patchwork Mon Apr 20 18:12:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6243611 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 0F4B8BF4A6 for ; Mon, 20 Apr 2015 18:19:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C91B20445 for ; Mon, 20 Apr 2015 18:19:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F6F920421 for ; Mon, 20 Apr 2015 18:19:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755504AbbDTSRh (ORCPT ); Mon, 20 Apr 2015 14:17:37 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:34750 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753984AbbDTSNL (ORCPT ); Mon, 20 Apr 2015 14:13:11 -0400 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) id 1YkGBx-0006Sf-RH; Mon, 20 Apr 2015 18:13:09 +0000 From: Al Viro To: Linus Torvalds Cc: Neil Brown , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 12/24] link_path_walk: turn inner loop into explicit goto Date: Mon, 20 Apr 2015 19:12:56 +0100 Message-Id: <1429553588-24764-12-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 | 61 ++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 5366b6d..86d54e5 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1832,6 +1832,10 @@ static int link_path_walk(const char *name, struct nameidata *nd) return err; if (err) { + struct path link; + void *cookie; + char *s; + if (unlikely(nd->link_count >= MAX_NESTED_LINKS)) { path_put_conditional(&next, nd); path_put(&nd->path); @@ -1842,41 +1846,40 @@ static int link_path_walk(const char *name, struct nameidata *nd) nd->depth++; nd->link_count++; - do { - struct path link = next; - void *cookie; - char *s = get_link(&link, nd, &cookie); - - if (unlikely(IS_ERR(s))) { - err = PTR_ERR(s); - nd->link_count--; - nd->depth--; - return err; +l: + link = next; + s = get_link(&link, nd, &cookie); + + if (unlikely(IS_ERR(s))) { + err = PTR_ERR(s); + nd->link_count--; + nd->depth--; + return err; + } + err = 0; + if (unlikely(!s)) { + /* jumped */ + put_link(nd, &link, cookie); + } else { + if (*s == '/') { + if (!nd->root.mnt) + set_root(nd); + path_put(&nd->path); + nd->path = nd->root; + path_get(&nd->root); + nd->flags |= LOOKUP_JUMPED; } - err = 0; - if (unlikely(!s)) { - /* jumped */ + nd->inode = nd->path.dentry->d_inode; + err = link_path_walk(s, nd); + if (unlikely(err)) { put_link(nd, &link, cookie); - break; } else { - if (*s == '/') { - if (!nd->root.mnt) - set_root(nd); - path_put(&nd->path); - nd->path = nd->root; - path_get(&nd->root); - nd->flags |= LOOKUP_JUMPED; - } - nd->inode = nd->path.dentry->d_inode; - err = link_path_walk(s, nd); - if (unlikely(err)) { - put_link(nd, &link, cookie); - break; - } err = walk_component(nd, &next, LOOKUP_FOLLOW); put_link(nd, &link, cookie); + if (err > 0) + goto l; } - } while (err > 0); + } nd->link_count--; nd->depth--;