From: Adam Kwolek <adam.kwolek@intel.com>
Date: Mon, 14 Mar 2011 07:17:52 +0000 (+1100)
Subject: FIX: Last_checkpoint has to be initialized in per disk units
X-Git-Tag: mdadm-3.2.1~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d51bfa20e231ebcbb15c2a278c837c8e3b6c2b1;p=thirdparty%2Fmdadm.git

FIX: Last_checkpoint has to be initialized in per disk units

last_checkpoint is variable that tracks sync_complete sysfs entry.
sync_complete is per disk counter, so initializing during starting from checkpoint
has to have this in mind and convert reshape position properly.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/managemon.c b/managemon.c
index 1362a0e9..19e5f417 100644
--- a/managemon.c
+++ b/managemon.c
@@ -667,6 +667,15 @@ static void manage_new(struct mdstat_ent *mdstat,
 		if (sysfs_get_ll(mdi, NULL, "reshape_position",
 			&new->last_checkpoint) != 0)
 			new->last_checkpoint = 0;
+		else {
+			int data_disks = mdi->array.raid_disks;
+			if (mdi->array.level == 4 || mdi->array.level == 5)
+				data_disks--;
+			if (mdi->array.level == 6)
+				data_disks -= 2;
+
+			new->last_checkpoint /= data_disks;
+		}
 		dprintf("mdmon: New monitored array is under reshape.\n"
 			"       Last checkpoint is: %llu\n",
 			new->last_checkpoint);