Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

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

diff --git a/fs/autofs/symlink.c b/fs/autofs/symlink.c
index 52e8772b066e33fece33d73ae5ddf30568c5b4ca..7ce9cb2c9ce21f74db531eef41d5df420feca5af 100644 (file)
--- a/fs/autofs/symlink.c
+++ b/fs/autofs/symlink.c
@@ -15,12 +15,12 @@
 /* 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 NULL;
 }
 
-struct inode_operations autofs_symlink_inode_operations = {
+const struct inode_operations autofs_symlink_inode_operations = {
        .readlink       = generic_readlink,
        .follow_link    = autofs_follow_link
 };