From patchwork Mon Apr 20 18:12:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6243441 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 1A7279F32B for ; Mon, 20 Apr 2015 18:16:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D6E7B20450 for ; Mon, 20 Apr 2015 18:16:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6005220454 for ; Mon, 20 Apr 2015 18:16:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755148AbbDTSOm (ORCPT ); Mon, 20 Apr 2015 14:14:42 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:34758 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754137AbbDTSNM (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-0006Sq-5d; 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 14/24] link_path_walk: get rid of duplication Date: Mon, 20 Apr 2015 19:12:58 +0100 Message-Id: <1429553588-24764-14-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 What we do after the second walk_component() + put_link() + depth decrement in there is exactly equivalent to what's done right after the first walk_component(). Easy to verify and not at all surprising, seeing that there we have just walked the last component of nested symlink. Signed-off-by: Al Viro --- fs/namei.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 06f1aa3..9cef3c0 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1828,6 +1828,7 @@ static int link_path_walk(const char *name, struct nameidata *nd) return 0; err = walk_component(nd, &next, LOOKUP_FOLLOW); +Walked: if (err < 0) return err; @@ -1846,7 +1847,6 @@ static int link_path_walk(const char *name, struct nameidata *nd) nd->depth++; nd->link_count++; -l: link = next; s = get_link(&link, nd, &cookie); @@ -1883,13 +1883,7 @@ l: put_link(nd, &link, cookie); nd->link_count--; nd->depth--; - if (err < 0) - return err; - if (err > 0) { - nd->link_count++; - nd->depth++; - goto l; - } + goto Walked; } } }