Revert "writeback: fix WB_SYNC_NONE writeback from umount"

[safe/jmp/linux-2.6] / fs / autofs / symlink.c

diff --git a/fs/autofs/symlink.c b/fs/autofs/symlink.c
index f028396..7ce9cb2 100644 (file)
--- a/fs/autofs/symlink.c
+++ b/fs/autofs/symlink.c
@@ -12,14 +12,15 @@
 
 #include "autofs_i.h"
 
-static int autofs_follow_link(struct dentry *dentry, struct nameidata *nd)
+/* 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;
+       char *s=((struct autofs_symlink *)dentry->d_inode->i_private)->data;
        nd_set_link(nd, s);
-       return 0;
+       return NULL;
 }
 
-struct inode_operations autofs_symlink_inode_operations = {
+const struct inode_operations autofs_symlink_inode_operations = {
        .readlink       = generic_readlink,
        .follow_link    = autofs_follow_link
 };