[dm-devel] [PATCH 1 of 2] DM RAID: variable cleanup

Jonathan Brassow jbrassow at ovpn-117-28.phx2.redhat.com
Mon Oct 2 22:17:35 UTC 2017


Patch name: dm-raid-variable-cleanup.patch

dm-raid: remove unneeded intermediate variable

No reason to have extra intermediate variable 'recovery_cp'.

Signed-off-by: Jonathan Brassow <jbrassow at redhat.com>
Index: linux-upstream/drivers/md/dm-raid.c
===================================================================
--- linux-upstream.orig/drivers/md/dm-raid.c
+++ linux-upstream/drivers/md/dm-raid.c
@@ -3297,11 +3297,10 @@ static const char *__raid_dev_status(str
 static sector_t rs_get_progress(struct raid_set *rs,
 				sector_t resync_max_sectors, bool *array_in_sync)
 {
-	sector_t r, recovery_cp, curr_resync_completed;
+	sector_t r, curr_resync_completed;
 	struct mddev *mddev = &rs->md;
 
 	curr_resync_completed = mddev->curr_resync_completed ?: mddev->recovery_cp;
-	recovery_cp = mddev->recovery_cp;
 	*array_in_sync = false;
 
 	if (rs_is_raid0(rs)) {
@@ -3330,7 +3329,7 @@ static sector_t rs_get_progress(struct r
 		} else if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))
 			r = curr_resync_completed;
 		else
-			r = recovery_cp;
+			r = mddev->recovery_cp;
 
 		if (r == MaxSector) {
 			/*




More information about the dm-devel mailing list