5 files changed, 9 insertions, 9 deletions

diff --git a/fs/sysv/file.c b/fs/sysv/file.c
index a59e303135..47a4b728f1 100644
--- a/fs/sysv/file.c
+++ b/fs/sysv/file.c
@@ -21,8 +21,10 @@
  */
 const struct file_operations sysv_file_operations = {
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
-        .write          = generic_file_write,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
+        .write          = do_sync_write,
+        .aio_write      = generic_file_aio_write,
         .mmap           = generic_file_mmap,
         .fsync          = sysv_sync_file,
         .sendfile       = generic_file_sendfile,
diff --git a/fs/sysv/ialloc.c b/fs/sysv/ialloc.c
index 9b585d1081..115ab0d6f4 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 58b2d22142..d63c5e48b0 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/namei.c b/fs/sysv/namei.c
index b8a73f716f..f7c08db8e3 100644
--- a/fs/sysv/namei.c
+++ b/fs/sysv/namei.c
@@ -250,7 +250,7 @@ static int sysv_rename(struct inode * old_dir, struct dentry * old_dentry,
                 sysv_set_link(new_de, new_page, old_inode);
                 new_inode->i_ctime = CURRENT_TIME_SEC;
                 if (dir_de)
-                        new_inode->i_nlink--;
+                        drop_nlink(new_inode);
                 inode_dec_link_count(new_inode);
         } else {
                 if (dir_de) {
diff --git a/fs/sysv/super.c b/fs/sysv/super.c
index 876639b933..350cba5d68 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;