From 71f7a897f96307e22b57c6527881ef90d10ef2c5 Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Sun, 1 Jun 2014 10:27:20 -0400 Subject: [PATCH] LU-4423 llite: remove ll_readlink as unnecessary Taken from kernel upstrem by Al Viro: lustre: generic_readlink() is just fine there, TYVM... Linux-commit: 4efcc9ffcd4fc53f1f7de539842cdffa1f8e5ecc Change-Id: I3693f5b7871f9a013c98f962eb9299ffbe32b705 Signed-off-by: Oleg Drokin Signed-off-by: James Simmons Reviewed-on: http://review.whamcloud.com/10123 Tested-by: Jenkins Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Bob Glossman --- lustre/llite/symlink.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c index d5ce025..e394efa 100644 --- a/lustre/llite/symlink.c +++ b/lustre/llite/symlink.c @@ -122,34 +122,12 @@ failed: RETURN (rc); } -static int ll_readlink(struct dentry *dentry, char *buffer, int buflen) -{ - struct inode *inode = dentry->d_inode; - struct ptlrpc_request *request; - char *symname; - int rc; - ENTRY; - - CDEBUG(D_VFSTRACE, "VFS Op\n"); - - ll_inode_size_lock(inode); - rc = ll_readlink_internal(inode, &request, &symname); - if (rc) - GOTO(out, rc); - - rc = vfs_readlink(dentry, buffer, buflen, symname); - out: - ptlrpc_req_finished(request); - ll_inode_size_unlock(inode); - RETURN(rc); -} - static void *ll_follow_link(struct dentry *dentry, struct nameidata *nd) { struct inode *inode = dentry->d_inode; struct ptlrpc_request *request = NULL; int rc; - char *symname; + char *symname = NULL; ENTRY; CDEBUG(D_VFSTRACE, "VFS Op\n"); @@ -184,7 +162,7 @@ static void ll_put_link(struct dentry *dentry, struct nameidata *nd, void *cooki } struct inode_operations ll_fast_symlink_inode_operations = { - .readlink = ll_readlink, + .readlink = generic_readlink, .setattr = ll_setattr, .follow_link = ll_follow_link, .put_link = ll_put_link, -- 1.8.3.1