Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965543AbbEEFeJ (ORCPT ); Tue, 5 May 2015 01:34:09 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:40021 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755630AbbEEFXH (ORCPT ); Tue, 5 May 2015 01:23:07 -0400 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 66/79] namei: lift (open-coded) terminate_walk() into callers of get_link() Date: Tue, 5 May 2015 06:22:40 +0100 Message-Id: <1430803373-4948-66-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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1563 Lines: 64 From: Al Viro Signed-off-by: Al Viro --- fs/namei.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 76bf620..f7bce07 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -892,7 +892,6 @@ const char *get_link(struct nameidata *nd) mntget(nd->link.mnt); if (unlikely(current->total_link_count >= MAXSYMLINKS)) { - path_put(&nd->path); path_put(&nd->link); return ERR_PTR(-ELOOP); } @@ -916,7 +915,6 @@ const char *get_link(struct nameidata *nd) res = inode->i_op->follow_link(dentry, &last->cookie, nd); if (IS_ERR(res)) { out: - path_put(&nd->path); path_put(&last->link); return res; } @@ -1819,7 +1817,7 @@ Walked: if (unlikely(IS_ERR(s))) { err = PTR_ERR(s); - goto Err; + break; } err = 0; if (unlikely(!s)) { @@ -1850,7 +1848,6 @@ Walked: } } terminate_walk(nd); -Err: while (unlikely(nd->depth)) put_link(nd); return err; @@ -1986,8 +1983,10 @@ static int trailing_symlink(struct nameidata *nd) return error; nd->flags |= LOOKUP_PARENT; s = get_link(nd); - if (unlikely(IS_ERR(s))) + if (unlikely(IS_ERR(s))) { + terminate_walk(nd); return PTR_ERR(s); + } if (unlikely(!s)) return 0; if (*s == '/') { -- 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/