Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

3 files changed, 6 insertions, 7 deletions

diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index ccd624ef4272..f4de4b98004f 100644
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -445,7 +445,7 @@ affs_error(struct super_block *sb, const char *function, const char *fmt, ...)
         va_list  args;
 
         va_start(args,fmt);
-        vsprintf(ErrorBuffer,fmt,args);
+        vsnprintf(ErrorBuffer,sizeof(ErrorBuffer),fmt,args);
         va_end(args);
 
         printk(KERN_CRIT "AFFS error (device %s): %s(): %s\n", sb->s_id,
@@ -461,7 +461,7 @@ affs_warning(struct super_block *sb, const char *function, const char *fmt, ...)
         va_list  args;
 
         va_start(args,fmt);
-        vsprintf(ErrorBuffer,fmt,args);
+        vsnprintf(ErrorBuffer,sizeof(ErrorBuffer),fmt,args);
         va_end(args);
 
         printk(KERN_WARNING "AFFS warning (device %s): %s(): %s\n", sb->s_id,
diff --git a/fs/affs/bitmap.c b/fs/affs/bitmap.c
index b0b953683c1a..b330009fe42d 100644
--- a/fs/affs/bitmap.c
+++ b/fs/affs/bitmap.c
@@ -289,12 +289,11 @@ int affs_init_bitmap(struct super_block *sb, int *flags)
         sbi->s_bmap_count = (sbi->s_partition_size - sbi->s_reserved +
                                  sbi->s_bmap_bits - 1) / sbi->s_bmap_bits;
         size = sbi->s_bmap_count * sizeof(*bm);
-        bm = sbi->s_bitmap = kmalloc(size, GFP_KERNEL);
+        bm = sbi->s_bitmap = kzalloc(size, GFP_KERNEL);
         if (!sbi->s_bitmap) {
                 printk(KERN_ERR "AFFS: Bitmap allocation failed\n");
                 return -ENOMEM;
         }
-        memset(sbi->s_bitmap, 0, size);
 
         bmap_blk = (__be32 *)sbi->s_root_bh->b_data;
         blk = sb->s_blocksize / 4 - 49;
diff --git a/fs/affs/super.c b/fs/affs/super.c
index 5ea72c3a16c3..3de93e799949 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -66,12 +66,12 @@ affs_write_super(struct super_block *sb)
         pr_debug("AFFS: write_super() at %lu, clean=%d\n", get_seconds(), clean);
 }
 
-static kmem_cache_t * affs_inode_cachep;
+static struct kmem_cache * affs_inode_cachep;
 
 static struct inode *affs_alloc_inode(struct super_block *sb)
 {
         struct affs_inode_info *ei;
-        ei = (struct affs_inode_info *)kmem_cache_alloc(affs_inode_cachep, SLAB_KERNEL);
+        ei = (struct affs_inode_info *)kmem_cache_alloc(affs_inode_cachep, GFP_KERNEL);
         if (!ei)
                 return NULL;
         ei->vfs_inode.i_version = 1;
@@ -83,7 +83,7 @@ static void affs_destroy_inode(struct inode *inode)
         kmem_cache_free(affs_inode_cachep, AFFS_I(inode));
 }
 
-static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
+static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
 {
         struct affs_inode_info *ei = (struct affs_inode_info *) foo;