summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2007-08-22 14:01:52 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-22 19:52:46 -0700
commit918f02383fb9ff5dba29709f3199189eeac55021 (patch)
tree26a3b5edb812ba02ecf8020d6734d8d6a2f8080c
parent59d9445e851976d973a5a4009f80a3d55959d231 (diff)
downloadop-kernel-dev-918f02383fb9ff5dba29709f3199189eeac55021.zip
op-kernel-dev-918f02383fb9ff5dba29709f3199189eeac55021.tar.gz
md: make sure a re-add after a restart honours bitmap when resyncing
Commit 1757128438d41670ded8bc3bc735325cc07dc8f9 was slightly bad. If an array has a write-intent bitmap, and you remove a drive, then readd it, only the changed parts should be resynced. However after the above commit, this only works if the array has not been shut down and restarted. This is because it sets 'fullsync' at little more often than it should. This patch is more careful. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/md/raid1.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 650991b..ea2a58d 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1972,7 +1972,8 @@ static int run(mddev_t *mddev)
!test_bit(In_sync, &disk->rdev->flags)) {
disk->head_position = 0;
mddev->degraded++;
- conf->fullsync = 1;
+ if (disk->rdev)
+ conf->fullsync = 1;
}
}
if (mddev->degraded == conf->raid_disks) {
OpenPOWER on IntegriCloud