From bc15ff05c5ebc92067f5407893e9587e9fc41796 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 22 May 2012 13:55:28 +1000 Subject: [PATCH] --- yaml --- r: 305959 b: refs/heads/master c: 30b67645faadcdc32072f999796b99bd0a20f2d5 h: refs/heads/master i: 305957: df55e7620d18a56df2f8edb927b40de5a74b932e 305955: 9bf5775e4cb4f5c3b2cf52711222286fbbc6f861 305951: fb090355c43485ff3754b8d39cdc64966f1a41eb v: v3 --- [refs] | 2 +- trunk/drivers/md/raid5.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0481ce448df4..230aeaa41e21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb63a7019df91933de6854a87ddc5488b49edb85 +refs/heads/master: 30b67645faadcdc32072f999796b99bd0a20f2d5 diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index eab6168bb7f4..8fba57e8f78b 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -5559,9 +5559,6 @@ static int check_reshape(struct mddev *mddev) mddev->new_layout == mddev->layout && mddev->new_chunk_sectors == mddev->chunk_sectors) return 0; /* nothing to do */ - if (mddev->bitmap) - /* Cannot grow a bitmap yet */ - return -EBUSY; if (has_failed(conf)) return -EINVAL; if (mddev->delta_disks < 0) { @@ -5596,6 +5593,9 @@ static int raid5_start_reshape(struct mddev *mddev) if (!check_stripe_cache(mddev)) return -ENOSPC; + if (has_failed(conf)) + return -EINVAL; + rdev_for_each(rdev, mddev) { if (!test_bit(In_sync, &rdev->flags) && !test_bit(Faulty, &rdev->flags))