Merge branch 'for-linus' of git://neil.brown.name/md

torvalds · torvalds · commit 6bee58259fce · 2009-11-09T09:57:02.000-08:00
* 'for-linus' of git://neil.brown.name/md:
  md/raid5: make sure curr_sync_completes is uptodate when reshape starts
  md: don't clear endpoint for resync when resync is interrupted.
diff --git a/drivers/md/md.c b/drivers/md/md.c
@@ -6504,8 +6504,9 @@ void md_do_sync(mddev_t *mddev)
  skip:
 	mddev->curr_resync = 0;
 	mddev->curr_resync_completed = 0;
-	mddev->resync_min = 0;
-	mddev->resync_max = MaxSector;
+	if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery))
+		/* We completed so max setting can be forgotten. */
+		mddev->resync_max = MaxSector;
 	sysfs_notify(&mddev->kobj, NULL, "sync_completed");
 	wake_up(&resync_wait);
 	set_bit(MD_RECOVERY_DONE, &mddev->recovery);
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
@@ -4049,6 +4049,8 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped
 			sector_nr = conf->reshape_progress;
 		sector_div(sector_nr, new_data_disks);
 		if (sector_nr) {
+			mddev->curr_resync_completed = sector_nr;
+			sysfs_notify(&mddev->kobj, NULL, "sync_completed");
 			*skipped = 1;
 			return sector_nr;
 		}

Original file line number	Diff line number	Diff line change
`@@ -4049,6 +4049,8 @@ static sector_t reshape_request(mddev_t mddev, sector_t sector_nr, int skipped`
`4049`	`4049`	`sector_nr = conf->reshape_progress;`
`4050`	`4050`	`sector_div(sector_nr, new_data_disks);`
`4051`	`4051`	`if (sector_nr) {`
	`4052`	`+ mddev->curr_resync_completed = sector_nr;`
	`4053`	`+ sysfs_notify(&mddev->kobj, NULL, "sync_completed");`
`4052`	`4054`	`*skipped = 1;`
`4053`	`4055`	`return sector_nr;`
`4054`	`4056`	`}`