summaryrefslogtreecommitdiffstats
path: root/drivers/md/md.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-07-03 15:59:06 +1000
committerNeilBrown <neilb@suse.de>2012-07-03 15:59:06 +1000
commitf456309106e9657645c81bce1a6bb3230393564e (patch)
tree0c24dc48b58913930702db35a0bef7d303dd1849 /drivers/md/md.c
parent32644afd8975d19174bcb9ba34687c32dd810a09 (diff)
downloadop-kernel-dev-f456309106e9657645c81bce1a6bb3230393564e.zip
op-kernel-dev-f456309106e9657645c81bce1a6bb3230393564e.tar.gz
md: support re-add of recovering devices.
We currently only allow a device to be re-added if it appear to be in-sync. This is overly restrictive as it may be desirable to re-add a device that is in the middle of recovery. So remove the test for "InSync" - the test on rdev->raid_disk is sufficient to ensure that the re-add will succeed. Reported-by: Alexander Lyakas <alex.bolshoy@gmail.com> Tested-by: Alexander Lyakas <alex.bolshoy@gmail.com> Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r--drivers/md/md.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index c601c4b..a4c219e 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5784,8 +5784,7 @@ static int add_new_disk(struct mddev * mddev, mdu_disk_info_t *info)
super_types[mddev->major_version].
validate_super(mddev, rdev);
if ((info->state & (1<<MD_DISK_SYNC)) &&
- (!test_bit(In_sync, &rdev->flags) ||
- rdev->raid_disk != info->raid_disk)) {
+ rdev->raid_disk != info->raid_disk) {
/* This was a hot-add request, but events doesn't
* match, so reject it.
*/
OpenPOWER on IntegriCloud