--- drivers/md/md.c

+++ drivers/md/md.c

@@ -305,6 +305,9 @@ static mddev_t * mddev_find(dev_t unit)

{

mddev_t *mddev, *new = NULL;

+ if (unit && MAJOR(unit) != MD_MAJOR)

+ unit &= ~((1<<MdpMinorShift)-1);

+

retry:

spin_lock(&all_mddevs_lock);

@@ -4802,9 +4805,10 @@ static int add_new_disk(mddev_t * mddev,

/* set saved_raid_disk if appropriate */

if (!mddev->persistent) {

if (info->state & (1<<MD_DISK_SYNC) &&

- info->raid_disk < mddev->raid_disks)

+ info->raid_disk < mddev->raid_disks) {

rdev->raid_disk = info->raid_disk;

- else

+ set_bit(In_sync, &rdev->flags);

+ } else

rdev->raid_disk = -1;

} else

super_types[mddev->major_version].