Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755356AbbEKSVO (ORCPT ); Mon, 11 May 2015 14:21:14 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:47403 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755011AbbEKSI0 (ORCPT ); Mon, 11 May 2015 14:08:26 -0400 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3 077/110] namei: simplify failure exits in get_link() Date: Mon, 11 May 2015 19:07:37 +0100 Message-Id: <1431367690-5223-77-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20150511180650.GA4147@ZenIV.linux.org.uk> References: <20150511180650.GA4147@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1329 Lines: 55 From: Al Viro when cookie is NULL, put_link() is equivalent to path_put(), so as soon as we'd set last->cookie to NULL, we can bump nd->depth and let the normal logics in terminate_walk() to take care of cleanups. Signed-off-by: Al Viro --- fs/namei.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index f311f03..678aeef 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -904,27 +904,23 @@ const char *get_link(struct nameidata *nd) last->link = nd->link; last->cookie = NULL; + nd->depth++; cond_resched(); touch_atime(&last->link); error = security_inode_follow_link(dentry); - res = ERR_PTR(error); if (error) - goto out; + return ERR_PTR(error); nd->last_type = LAST_BIND; res = inode->i_link; if (!res) { res = inode->i_op->follow_link(dentry, &last->cookie); - if (IS_ERR(res)) { -out: - path_put(&last->link); - return res; - } + if (IS_ERR_OR_NULL(res)) + last->cookie = NULL; } - nd->depth++; return res; } -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/