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

Commit 0a19caab authored by majianpeng's avatar majianpeng Committed by NeilBrown
Browse files

md: Use ->curr_resync as last completed request when cleanly aborting resync. 



If a resync is aborted cleanly, ->curr_resync is a reliable
record of where we got up to.
If there was an error it is less reliable but we always know that
->curr_resync_completed is safe.

So add a flag MD_RECOVERY_ERROR to differentiate between these cases
and set recovery_cp accordingly.

Signed-off-by: default avatarJianpeng Ma <majianpeng@gmail.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 4f8c55c5

drivers/md/md.c

+8 −2
Original line number Diff line number Diff line
@@ -7180,6 +7180,7 @@ void md_done_sync(struct mddev *mddev, int blocks, int ok) 
	wake_up(&mddev->recovery_wait);

	if (!ok) {

		set_bit(MD_RECOVERY_INTR, &mddev->recovery);

		set_bit(MD_RECOVERY_ERROR, &mddev->recovery);

		md_wakeup_thread(mddev->thread);

		// stop recovery, signal do_sync ....

	}
@@ -7574,8 +7575,13 @@ void md_do_sync(struct md_thread *thread) 
					printk(KERN_INFO

					       "md: checkpointing %s of %s.\n",

					       desc, mdname(mddev));

					if (test_bit(MD_RECOVERY_ERROR,

						&mddev->recovery))

						mddev->recovery_cp =

							mddev->curr_resync_completed;

					else

						mddev->recovery_cp =

							mddev->curr_resync;

				}

			} else

				mddev->recovery_cp = MaxSector;

drivers/md/md.h

+2 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ struct mddev { 
	 * REQUEST:  user-space has requested a sync (used with SYNC)

	 * CHECK:    user-space request for check-only, no repair

	 * RESHAPE:  A reshape is happening

	 * ERROR:    sync-action interrupted because io-error

	 *

	 * If neither SYNC or RESHAPE are set, then it is a recovery.

	 */
@@ -320,6 +321,7 @@ struct mddev { 
#define	MD_RECOVERY_CHECK	7

#define MD_RECOVERY_RESHAPE	8

#define	MD_RECOVERY_FROZEN	9

#define	MD_RECOVERY_ERROR	10



	unsigned long			recovery;

	/* If a RAID personality determines that recovery (of a particular