From: NeilBrown - version-1 superblock + The default_bitmap_offset is in sectors, not bytes. + the 'size' field in the superblock is in sectors, not KB - raid0_run should return a negative number on error, not '1' - raid10_read_balance should not return a valid 'disk' number if ->rdev turned out to be NULL - kmem_cache_destroy doesn't like being passed a NULL. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton --- drivers/md/md.c | 4 ++-- drivers/md/raid0.c | 2 +- drivers/md/raid10.c | 2 ++ drivers/md/raid5.c | 3 ++- drivers/md/raid6main.c | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff -puN drivers/md/md.c~md-assorted-little-md-fixes drivers/md/md.c --- 25/drivers/md/md.c~md-assorted-little-md-fixes Thu Feb 2 16:19:56 2006 +++ 25-akpm/drivers/md/md.c Thu Feb 2 16:19:56 2006 @@ -1081,7 +1081,7 @@ static int super_1_validate(mddev_t *mdd mddev->size = le64_to_cpu(sb->size)/2; mddev->events = le64_to_cpu(sb->events); mddev->bitmap_offset = 0; - mddev->default_bitmap_offset = 1024; + mddev->default_bitmap_offset = 1024 >> 9; mddev->recovery_cp = le64_to_cpu(sb->resync_offset); memcpy(mddev->uuid, sb->set_uuid, 16); @@ -1162,7 +1162,7 @@ static void super_1_sync(mddev_t *mddev, sb->cnt_corrected_read = atomic_read(&rdev->corrected_errors); sb->raid_disks = cpu_to_le32(mddev->raid_disks); - sb->size = cpu_to_le64(mddev->size); + sb->size = cpu_to_le64(mddev->size<<1); if (mddev->bitmap && mddev->bitmap_file == NULL) { sb->bitmap_offset = cpu_to_le32((__u32)mddev->bitmap_offset); diff -puN drivers/md/raid0.c~md-assorted-little-md-fixes drivers/md/raid0.c --- 25/drivers/md/raid0.c~md-assorted-little-md-fixes Thu Feb 2 16:19:56 2006 +++ 25-akpm/drivers/md/raid0.c Thu Feb 2 16:19:56 2006 @@ -372,7 +372,7 @@ out_free_conf: kfree(conf); mddev->private = NULL; out: - return 1; + return -ENOMEM; } static int raid0_stop (mddev_t *mddev) diff -puN drivers/md/raid10.c~md-assorted-little-md-fixes drivers/md/raid10.c --- 25/drivers/md/raid10.c~md-assorted-little-md-fixes Thu Feb 2 16:19:56 2006 +++ 25-akpm/drivers/md/raid10.c Thu Feb 2 16:19:56 2006 @@ -565,6 +565,8 @@ rb_out: if (disk >= 0 && (rdev=rcu_dereference(conf->mirrors[disk].rdev))!= NULL) atomic_inc(&conf->mirrors[disk].rdev->nr_pending); + else + disk = -1; rcu_read_unlock(); return disk; diff -puN drivers/md/raid5.c~md-assorted-little-md-fixes drivers/md/raid5.c --- 25/drivers/md/raid5.c~md-assorted-little-md-fixes Thu Feb 2 16:19:56 2006 +++ 25-akpm/drivers/md/raid5.c Thu Feb 2 16:19:56 2006 @@ -350,7 +350,8 @@ static void shrink_stripes(raid5_conf_t while (drop_one_stripe(conf)) ; - kmem_cache_destroy(conf->slab_cache); + if (conf->slab_cache) + kmem_cache_destroy(conf->slab_cache); conf->slab_cache = NULL; } diff -puN drivers/md/raid6main.c~md-assorted-little-md-fixes drivers/md/raid6main.c --- 25/drivers/md/raid6main.c~md-assorted-little-md-fixes Thu Feb 2 16:19:56 2006 +++ 25-akpm/drivers/md/raid6main.c Thu Feb 2 16:19:56 2006 @@ -366,7 +366,8 @@ static void shrink_stripes(raid6_conf_t while (drop_one_stripe(conf)) ; - kmem_cache_destroy(conf->slab_cache); + if (conf->slab_cache) + kmem_cache_destroy(conf->slab_cache); conf->slab_cache = NULL; } _