fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / autofs / symlink.c

diff --git a/fs/autofs/symlink.c b/fs/autofs/symlink.c
index 237a630..c74f2eb 100644 (file)
--- a/fs/autofs/symlink.c
+++ b/fs/autofs/symlink.c
@@ -12,19 +12,15 @@
 
 #include "autofs_i.h"
 
-static int autofs_readlink(struct dentry *dentry, char *buffer, int buflen)
+/* Nothing to release.. */
+static void *autofs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-       char *s=((struct autofs_symlink *)dentry->d_inode->u.generic_ip)->data;
-       return vfs_readlink(dentry, buffer, buflen, s);
-}
-
-static int autofs_follow_link(struct dentry *dentry, struct nameidata *nd)
-{
-       char *s=((struct autofs_symlink *)dentry->d_inode->u.generic_ip)->data;
-       return vfs_follow_link(nd, s);
+       char *s=((struct autofs_symlink *)dentry->d_inode->i_private)->data;
+       nd_set_link(nd, s);
+       return NULL;
 }
 
 struct inode_operations autofs_symlink_inode_operations = {
-       .readlink       = autofs_readlink,
+       .readlink       = generic_readlink,
        .follow_link    = autofs_follow_link
 };