Merge branch 'master' into upstream

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/autofs/symlink.c b/fs/autofs/symlink.c
index 52e8772b066e..c74f2eb65775 100644
--- a/fs/autofs/symlink.c
+++ b/fs/autofs/symlink.c
@@ -15,7 +15,7 @@
 /* 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;
 }