[dm-devel] [PATCH 1 of 2] dm-raid-cleanup-parameter-handling-2.patch

[Jonathan Brassow]

Correct parameter count for RAID status table.

The parameters for rebuilds are already counted by the preceding
'for' loop.  Do not count them again.

Signed-off-by: Jonathan Brassow <jbrassow at redhat.com>

Index: linux-2.6/drivers/md/dm-raid.c
===================================================================
--- linux-2.6.orig/drivers/md/dm-raid.c
+++ linux-2.6/drivers/md/dm-raid.c
@@ -554,7 +554,7 @@ static int raid_status(struct dm_target 
 			    !test_bit(In_sync, &rs->dev[i].rdev.flags))
 				raid_param_cnt += 2; /* for rebuilds */
 
-		raid_param_cnt += (hweight64(rs->print_flags) * 2);
+		raid_param_cnt += (hweight64(rs->print_flags & ~DMPF_REBUILD) * 2);
 		if (rs->print_flags & (DMPF_SYNC | DMPF_NOSYNC))
 			raid_param_cnt--;