5 files changed, 6 insertions, 8 deletions

diff --git a/fs/sysv/ialloc.c b/fs/sysv/ialloc.c
index 9b585d1081c0..115ab0d6f4bc 100644
--- a/fs/sysv/ialloc.c
+++ b/fs/sysv/ialloc.c
@@ -170,7 +170,7 @@ struct inode * sysv_new_inode(const struct inode * dir, mode_t mode)
         inode->i_uid = current->fsuid;
         inode->i_ino = fs16_to_cpu(sbi, ino);
         inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
-        inode->i_blocks = inode->i_blksize = 0;
+        inode->i_blocks = 0;
         memset(SYSV_I(inode)->i_data, 0, sizeof(SYSV_I(inode)->i_data));
         SYSV_I(inode)->i_dir_start_lookup = 0;
         insert_inode_hash(inode);
diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c
index 58b2d22142ba..d63c5e48b050 100644
--- a/fs/sysv/inode.c
+++ b/fs/sysv/inode.c
@@ -201,7 +201,7 @@ static void sysv_read_inode(struct inode *inode)
         inode->i_ctime.tv_nsec = 0;
         inode->i_atime.tv_nsec = 0;
         inode->i_mtime.tv_nsec = 0;
-        inode->i_blocks = inode->i_blksize = 0;
+        inode->i_blocks = 0;
 
         si = SYSV_I(inode);
         for (block = 0; block < 10+1+1+1; block++)
diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c
index 86f5f8d43d0f..f2bcccd1d6fc 100644
--- a/fs/sysv/itree.c
+++ b/fs/sysv/itree.c
@@ -465,7 +465,7 @@ static sector_t sysv_bmap(struct address_space *mapping, sector_t block)
 {
         return generic_block_bmap(mapping,block,get_block);
 }
-struct address_space_operations sysv_aops = {
+const struct address_space_operations sysv_aops = {
         .readpage = sysv_readpage,
         .writepage = sysv_writepage,
         .sync_page = block_sync_page,
diff --git a/fs/sysv/super.c b/fs/sysv/super.c
index 876639b93321..350cba5d6803 100644
--- a/fs/sysv/super.c
+++ b/fs/sysv/super.c
@@ -369,10 +369,9 @@ static int sysv_fill_super(struct super_block *sb, void *data, int silent)
         if (64 != sizeof (struct sysv_inode))
                 panic("sysv fs: bad inode size");
 
-        sbi = kmalloc(sizeof(struct sysv_sb_info), GFP_KERNEL);
+        sbi = kzalloc(sizeof(struct sysv_sb_info), GFP_KERNEL);
         if (!sbi)
                 return -ENOMEM;
-        memset(sbi, 0, sizeof(struct sysv_sb_info));
 
         sbi->s_sb = sb;
         sbi->s_block_base = 0;
@@ -453,10 +452,9 @@ static int v7_fill_super(struct super_block *sb, void *data, int silent)
         if (64 != sizeof (struct sysv_inode))
                 panic("sysv fs: bad i-node size");
 
-        sbi = kmalloc(sizeof(struct sysv_sb_info), GFP_KERNEL);
+        sbi = kzalloc(sizeof(struct sysv_sb_info), GFP_KERNEL);
         if (!sbi)
                 return -ENOMEM;
-        memset(sbi, 0, sizeof(struct sysv_sb_info));
 
         sbi->s_sb = sb;
         sbi->s_block_base = 0;
diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
index 393a480e4deb..9dcc82120935 100644
--- a/fs/sysv/sysv.h
+++ b/fs/sysv/sysv.h
@@ -161,7 +161,7 @@ extern struct inode_operations sysv_dir_inode_operations;
 extern struct inode_operations sysv_fast_symlink_inode_operations;
 extern const struct file_operations sysv_file_operations;
 extern const struct file_operations sysv_dir_operations;
-extern struct address_space_operations sysv_aops;
+extern const struct address_space_operations sysv_aops;
 extern struct super_operations sysv_sops;
 extern struct dentry_operations sysv_dentry_operations;