diff options
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index be7873c61b3c..dbf540a7fccc 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -645,7 +645,7 @@ static int super_90_validate(mddev_t *mddev, mdk_rdev_t *rdev) | |||
| 645 | 645 | ||
| 646 | if (sb->state & (1<<MD_SB_BITMAP_PRESENT) && | 646 | if (sb->state & (1<<MD_SB_BITMAP_PRESENT) && |
| 647 | mddev->bitmap_file == NULL) { | 647 | mddev->bitmap_file == NULL) { |
| 648 | if (mddev->level != 1) { | 648 | if (mddev->level != 1 && mddev->level != 5) { |
| 649 | /* FIXME use a better test */ | 649 | /* FIXME use a better test */ |
| 650 | printk(KERN_WARNING "md: bitmaps only support for raid1\n"); | 650 | printk(KERN_WARNING "md: bitmaps only support for raid1\n"); |
| 651 | return -EINVAL; | 651 | return -EINVAL; |
| @@ -3517,7 +3517,6 @@ void md_done_sync(mddev_t *mddev, int blocks, int ok) | |||
| 3517 | */ | 3517 | */ |
| 3518 | void md_write_start(mddev_t *mddev, struct bio *bi) | 3518 | void md_write_start(mddev_t *mddev, struct bio *bi) |
| 3519 | { | 3519 | { |
| 3520 | DEFINE_WAIT(w); | ||
| 3521 | if (bio_data_dir(bi) != WRITE) | 3520 | if (bio_data_dir(bi) != WRITE) |
| 3522 | return; | 3521 | return; |
| 3523 | 3522 | ||
