aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/md/md.c2
-rw-r--r--drivers/md/raid1.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 207e25667f41..319b86fe2595 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3160,6 +3160,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)
if (err)
export_rdev(rdev);
+ md_update_sb(mddev);
set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
md_wakeup_thread(mddev->thread);
return err;
@@ -4679,7 +4680,6 @@ static void md_do_sync(mddev_t *mddev)
mddev->pers->sync_request(mddev, max_sectors, &skipped, 1);
if (!test_bit(MD_RECOVERY_ERR, &mddev->recovery) &&
- mddev->curr_resync > 2 &&
mddev->curr_resync >= mddev->recovery_cp) {
if (test_bit(MD_RECOVERY_INTR, &mddev->recovery)) {
printk(KERN_INFO
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index b8889200718b..20dd22d3898f 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1898,6 +1898,7 @@ static int run(mddev_t *mddev)
if (!disk->rdev) {
disk->head_position = 0;
mddev->degraded++;
+ conf->fullsync = 1;
}
}