Commit ca755175 authored Jun 02, 2014 by Linus Torvalds

Merge tag 'md/3.15-fixes' of git://neil.brown.name/md

Pull two md bugfixes from Neil Brown:
 "Two md bugfixes for possible corruption when restarting reshape

  If a raid5/6 reshape is restarted (After stopping and re-assembling
  the array) and the array is marked read-only (or read-auto), then the
  reshape will appear to complete immediately, without actually moving
  anything around.  This can result in corruption.

  There are two patches which do much the same thing in different
  places.  They are separate because one is an older bug and so can be
  applied to more -stable kernels"

* tag 'md/3.15-fixes' of git://neil.brown.name/md:
  md: always set MD_RECOVERY_INTR when interrupting a reshape thread.
  md: always set MD_RECOVERY_INTR when aborting a reshape or other "resync".

parents 3b8d2676 2ac295a5

drivers/md/md.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -7381,8 +7381,10 @@ void md_do_sync(struct md_thread *thread)
		/* just incase thread restarts... */
		if (test_bit(MD_RECOVERY_DONE, &mddev->recovery))
		return;
		if (mddev->ro) /* never try to sync a read-only array */
		if (mddev->ro) {/* never try to sync a read-only array */
		set_bit(MD_RECOVERY_INTR, &mddev->recovery);
		return;
		}

		if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {
		if (test_bit(MD_RECOVERY_CHECK, &mddev->recovery)) {
		@@ -7824,6 +7826,7 @@ void md_check_recovery(struct mddev *mddev)
		/* There is no thread, but we need to call
		* ->spare_active and clear saved_raid_disk
		*/
		set_bit(MD_RECOVERY_INTR, &mddev->recovery);
		md_reap_sync_thread(mddev);
		clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
		goto unlock;

Admin message