Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Manually resolve conflict in include/mtd/Kbuild

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

5 files changed, 7 insertions, 9 deletions

diff --git a/fs/ufs/file.c b/fs/ufs/file.c
index a9c6e5f04f..1e096323ba 100644
--- a/fs/ufs/file.c
+++ b/fs/ufs/file.c
@@ -53,8 +53,10 @@ static int ufs_sync_file(struct file *file, struct dentry *dentry, int datasync)
  
 const struct file_operations ufs_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,
         .open           = generic_file_open,
         .fsync          = ufs_sync_file,
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c
index 9501dcd3b2..2ad1259c6e 100644
--- a/fs/ufs/ialloc.c
+++ b/fs/ufs/ialloc.c
@@ -255,7 +255,6 @@ cg_found:
                 inode->i_gid = current->fsgid;
 
         inode->i_ino = cg * uspi->s_ipg + bit;
-        inode->i_blksize = PAGE_SIZE;   /* This is the optimal IO size (for stat), not the fs block size */
         inode->i_blocks = 0;
         inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
         ufsi->i_flags = UFS_I(dir)->i_flags;
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 30c6e8a944..ee1eaa6f4e 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -741,7 +741,6 @@ void ufs_read_inode(struct inode * inode)
                 ufs1_read_inode(inode, ufs_inode + ufs_inotofsbo(inode->i_ino));
         }
 
-        inode->i_blksize = PAGE_SIZE;/*This is the optimal IO size (for stat)*/
         inode->i_version++;
         ufsi->i_lastfrag =
                 (inode->i_size + uspi->s_fsize - 1) >> uspi->s_fshift;
diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index d344b411e2..e84c0ecf07 100644
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -308,7 +308,7 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
                 ufs_set_link(new_dir, 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/ufs/super.c b/fs/ufs/super.c
index 992ee0b87c..ec79e3091d 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -611,11 +611,10 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
         
         UFSD("ENTER\n");
                 
-        sbi = kmalloc(sizeof(struct ufs_sb_info), GFP_KERNEL);
+        sbi = kzalloc(sizeof(struct ufs_sb_info), GFP_KERNEL);
         if (!sbi)
                 goto failed_nomem;
         sb->s_fs_info = sbi;
-        memset(sbi, 0, sizeof(struct ufs_sb_info));
 
         UFSD("flag %u\n", (int)(sb->s_flags & MS_RDONLY));
         
@@ -1245,8 +1244,7 @@ static int init_inodecache(void)
 
 static void destroy_inodecache(void)
 {
-        if (kmem_cache_destroy(ufs_inode_cachep))
-                printk(KERN_INFO "ufs_inode_cache: not all structures were freed\n");
+        kmem_cache_destroy(ufs_inode_cachep);
 }
 
 #ifdef CONFIG_QUOTA