Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17571284 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] md: assorted md and raid1 one-liners 



Fix few bugs that meant that:
  - superblocks weren't alway written at exactly the right time (this
    could show up if the array was not written to - writting to the array
    causes lots of superblock updates and so hides these errors).

  - restarting device recovery after a clean shutdown (version-1 metadata
    only) didn't work as intended (or at all).

1/ Ensure superblock is updated when a new device is added.
2/ Remove an inappropriate test on MD_RECOVERY_SYNC in md_do_sync.
   The body of this if takes one of two branches depending on whether
   MD_RECOVERY_SYNC is set, so testing it in the clause of the if
   is wrong.
3/ Flag superblock for updating after a resync/recovery finishes.
4/ If we find the neeed to restart a recovery in the middle (version-1
   metadata only) make sure a full recovery (not just as guided by
   bitmaps) does get done.

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c2b00852

drivers/md/md.c

+2 −1
Original line number Diff line number Diff line
@@ -3724,6 +3724,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info) 
		if (err)

			export_rdev(rdev);



		md_update_sb(mddev, 1);

		set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);

		md_wakeup_thread(mddev->thread);

		return err;
@@ -5275,7 +5276,6 @@ void md_do_sync(mddev_t *mddev) 
	mddev->pers->sync_request(mddev, max_sectors, &skipped, 1);



	if (!test_bit(MD_RECOVERY_ERR, &mddev->recovery) &&

	    test_bit(MD_RECOVERY_SYNC, &mddev->recovery) &&

	    !test_bit(MD_RECOVERY_CHECK, &mddev->recovery) &&

	    mddev->curr_resync > 2) {

		if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {
@@ -5299,6 +5299,7 @@ void md_do_sync(mddev_t *mddev) 
					rdev->recovery_offset = mddev->curr_resync;

		}

	}

	set_bit(MD_CHANGE_DEVS, &mddev->flags);



 skip:

	mddev->curr_resync = 0;

drivers/md/raid1.c

+1 −0
Original line number Diff line number Diff line
@@ -1951,6 +1951,7 @@ static int run(mddev_t *mddev) 
		    !test_bit(In_sync, &disk->rdev->flags)) {

			disk->head_position = 0;

			mddev->degraded++;

			conf->fullsync = 1;

		}

	}

	if (mddev->degraded == conf->raid_disks) {