From 2b7e3a8c6ca967c632e82d91bf871b072cd3f5aa Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 1 Jun 2010 19:37:26 +1000 Subject: [PATCH] --- yaml --- r: 208367 b: refs/heads/master c: 676e42d896ab6967859fabbb06f4e11b9615cbcf h: refs/heads/master i: 208365: 900b424d96fe78f51303aa0e4e85b25d7033cdd0 208363: ade709385c3e2409265222d3ee950cc849bab79c 208359: b4e7bf557f889c0751bdaf6eb9fa3a5b8923d094 208351: 847c1bffdcc5c4eb879c48fa5e7d6855e040b1e7 v: v3 --- [refs] | 2 +- trunk/drivers/md/bitmap.c | 3 ++- trunk/drivers/md/md.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 31c9afb01a61..0f19faee13be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4be6b43f1ac60dff00ef0923ee43b0e08872947 +refs/heads/master: 676e42d896ab6967859fabbb06f4e11b9615cbcf diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c index 1742435ce3ae..4518994712c7 100644 --- a/trunk/drivers/md/bitmap.c +++ b/trunk/drivers/md/bitmap.c @@ -1526,7 +1526,8 @@ void bitmap_cond_end_sync(struct bitmap *bitmap, sector_t sector) atomic_read(&bitmap->mddev->recovery_active) == 0); bitmap->mddev->curr_resync_completed = bitmap->mddev->curr_resync; - set_bit(MD_CHANGE_CLEAN, &bitmap->mddev->flags); + if (bitmap->mddev->persistent) + set_bit(MD_CHANGE_CLEAN, &bitmap->mddev->flags); sector &= ~((1ULL << CHUNK_BLOCK_SHIFT(bitmap)) - 1); s = 0; while (s < sector && s < bitmap->mddev->resync_max_sectors) { diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index 9007651ce175..d636b0a40fac 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -6753,7 +6753,8 @@ void md_do_sync(mddev_t *mddev) atomic_read(&mddev->recovery_active) == 0); mddev->curr_resync_completed = mddev->curr_resync; - set_bit(MD_CHANGE_CLEAN, &mddev->flags); + if (mddev->persistent) + set_bit(MD_CHANGE_CLEAN, &mddev->flags); sysfs_notify(&mddev->kobj, NULL, "sync_completed"); }