From patchwork Mon Apr 20 18:12:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6243601 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 859EEBF4A6 for ; Mon, 20 Apr 2015 18:19:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF06320445 for ; Mon, 20 Apr 2015 18:19:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C661820421 for ; Mon, 20 Apr 2015 18:19:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755509AbbDTSRi (ORCPT ); Mon, 20 Apr 2015 14:17:38 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:34747 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754028AbbDTSNL (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-0006SX-LR; 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 11/24] link_path_walk: don't bother with walk_component() after jumping link Date: Mon, 20 Apr 2015 19:12:55 +0100 Message-Id: <1429553588-24764-11-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 ... it does nothing if nd->last_type is LAST_BIND. Signed-off-by: Al Viro --- fs/namei.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 6e6630c..5366b6d 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1854,7 +1854,11 @@ static int link_path_walk(const char *name, struct nameidata *nd) return err; } err = 0; - if (likely(s)) { + if (unlikely(!s)) { + /* jumped */ + put_link(nd, &link, cookie); + break; + } else { if (*s == '/') { if (!nd->root.mnt) set_root(nd); @@ -1869,9 +1873,9 @@ static int link_path_walk(const char *name, struct nameidata *nd) put_link(nd, &link, cookie); break; } + err = walk_component(nd, &next, LOOKUP_FOLLOW); + put_link(nd, &link, cookie); } - err = walk_component(nd, &next, LOOKUP_FOLLOW); - put_link(nd, &link, cookie); } while (err > 0); nd->link_count--;