Merge branch 'master' into upstream

2 files changed, 3 insertions, 5 deletions

diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index af2efbbb5d76..2c9759baad61 100644
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -129,10 +129,9 @@ int autofs_fill_super(struct super_block *s, void *data, int silent)
         struct autofs_sb_info *sbi;
         int minproto, maxproto;
 
-        sbi = kmalloc(sizeof(*sbi), GFP_KERNEL);
+        sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
         if ( !sbi )
                 goto fail_unlock;
-        memset(sbi, 0, sizeof(*sbi));
         DPRINTK(("autofs: starting up, sbi = %p\n",sbi));
 
         s->s_fs_info = sbi;
@@ -217,7 +216,6 @@ static void autofs_read_inode(struct inode *inode)
         inode->i_nlink = 2;
         inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
         inode->i_blocks = 0;
-        inode->i_blksize = 1024;
 
         if ( ino == AUTOFS_ROOT_INO ) {
                 inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
@@ -242,7 +240,7 @@ static void autofs_read_inode(struct inode *inode)
                 
                 inode->i_op = &autofs_symlink_inode_operations;
                 sl = &sbi->symlink[n];
-                inode->u.generic_ip = sl;
+                inode->i_private = sl;
                 inode->i_mode = S_IFLNK | S_IRWXUGO;
                 inode->i_mtime.tv_sec = inode->i_ctime.tv_sec = sl->mtime;
                 inode->i_mtime.tv_nsec = inode->i_ctime.tv_nsec = 0;
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;
 }