Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932994AbbEEF1M (ORCPT ); Tue, 5 May 2015 01:27:12 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:40109 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755719AbbEEFXc (ORCPT ); Tue, 5 May 2015 01:23:32 -0400 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 31/79] namei: don't bother with ->follow_link() if ->i_link is set Date: Tue, 5 May 2015 06:22:05 +0100 Message-Id: <1430803373-4948-31-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: 1648 Lines: 61 From: Al Viro with new calling conventions it's trivial Signed-off-by: Al Viro Conflicts: fs/namei.c --- fs/namei.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 5f2c986..dbcbe42 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -865,11 +865,14 @@ get_link(struct path *link, struct nameidata *nd, void **p) nd->last_type = LAST_BIND; *p = NULL; - res = inode->i_op->follow_link(dentry, p, nd); - if (IS_ERR(res)) { + res = inode->i_link; + if (!res) { + res = inode->i_op->follow_link(dentry, p, nd); + if (IS_ERR(res)) { out: - path_put(&nd->path); - path_put(link); + path_put(&nd->path); + path_put(link); + } } return res; } @@ -4411,11 +4414,14 @@ EXPORT_SYMBOL(readlink_copy); int generic_readlink(struct dentry *dentry, char __user *buffer, int buflen) { void *cookie; - const char *link = dentry->d_inode->i_op->follow_link(dentry, &cookie, NULL); + const char *link = dentry->d_inode->i_link; int res; - if (IS_ERR(link)) - return PTR_ERR(link); + if (!link) { + link = dentry->d_inode->i_op->follow_link(dentry, &cookie, NULL); + if (IS_ERR(link)) + return PTR_ERR(link); + } res = readlink_copy(buffer, buflen, link); if (cookie && dentry->d_inode->i_op->put_link) dentry->d_inode->i_op->put_link(dentry, cookie); -- 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/