From cabb7e1a4c566f51104ded5920b38ea31da40c47 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Fri, 14 Jan 2011 09:14:34 +1100 Subject: [PATCH] --- yaml --- r: 230653 b: refs/heads/master c: 75d3da43cb74d2e5fb87816dbfecb839cd97c7f4 h: refs/heads/master i: 230651: bf9b17433a022ea05f88b567697487f1d86d464f v: v3 --- [refs] | 2 +- trunk/drivers/md/bitmap.c | 2 +- trunk/drivers/md/md.c | 5 ++--- trunk/drivers/md/raid5.c | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 9e3a54284155..854752fbd403 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6ff7e089c7fca813c956ccbed824087e89a3a49 +refs/heads/master: 75d3da43cb74d2e5fb87816dbfecb839cd97c7f4 diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c index 6cf587196b99..9a35320fb59f 100644 --- a/trunk/drivers/md/bitmap.c +++ b/trunk/drivers/md/bitmap.c @@ -1546,7 +1546,7 @@ void bitmap_cond_end_sync(struct bitmap *bitmap, sector_t sector) wait_event(bitmap->mddev->recovery_wait, atomic_read(&bitmap->mddev->recovery_active) == 0); - bitmap->mddev->curr_resync_completed = bitmap->mddev->curr_resync; + bitmap->mddev->curr_resync_completed = sector; set_bit(MD_CHANGE_CLEAN, &bitmap->mddev->flags); sector &= ~((1ULL << CHUNK_BLOCK_SHIFT(bitmap)) - 1); s = 0; diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index b98a85fd10b6..42b1d9ead7f2 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -6824,7 +6824,7 @@ void md_do_sync(mddev_t *mddev) desc, mdname(mddev)); mddev->curr_resync = j; } - mddev->curr_resync_completed = mddev->curr_resync; + mddev->curr_resync_completed = j; while (j < max_sectors) { sector_t sectors; @@ -6842,8 +6842,7 @@ void md_do_sync(mddev_t *mddev) md_unplug(mddev); wait_event(mddev->recovery_wait, atomic_read(&mddev->recovery_active) == 0); - mddev->curr_resync_completed = - mddev->curr_resync; + mddev->curr_resync_completed = j; set_bit(MD_CHANGE_CLEAN, &mddev->flags); sysfs_notify(&mddev->kobj, NULL, "sync_completed"); } diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index 9212c077095c..d223a6c0ccc4 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -4236,7 +4236,7 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped wait_event(conf->wait_for_overlap, atomic_read(&conf->reshape_stripes)==0); mddev->reshape_position = conf->reshape_progress; - mddev->curr_resync_completed = mddev->curr_resync; + mddev->curr_resync_completed = sector_nr; conf->reshape_checkpoint = jiffies; set_bit(MD_CHANGE_DEVS, &mddev->flags); md_wakeup_thread(mddev->thread); @@ -4337,7 +4337,7 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped wait_event(conf->wait_for_overlap, atomic_read(&conf->reshape_stripes) == 0); mddev->reshape_position = conf->reshape_progress; - mddev->curr_resync_completed = mddev->curr_resync + reshape_sectors; + mddev->curr_resync_completed = sector_nr; conf->reshape_checkpoint = jiffies; set_bit(MD_CHANGE_DEVS, &mddev->flags); md_wakeup_thread(mddev->thread);