Whamcloud - gitweb
LU-4423 llite: remove ll_readlink as unnecessary 23/10123/8
authorOleg Drokin <oleg.drokin@intel.com>
Sun, 1 Jun 2014 14:27:20 +0000 (10:27 -0400)
committerOleg Drokin <oleg.drokin@intel.com>
Mon, 16 Jun 2014 02:44:30 +0000 (02:44 +0000)
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 <oleg.drokin@intel.com>
Signed-off-by: James Simmons <uja.ornl@gmail.com>
Reviewed-on: http://review.whamcloud.com/10123
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
lustre/llite/symlink.c

index d5ce025..e394efa 100644 (file)
@@ -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,