Skip to contentSkip to conversation

Subject: [PATCH 001/009]: have raid0 compile with MD_DEBUG on

PATCH raz ben yehuda 2 participants 2 messages May 19, 2009 – May 20, 2009 MD RAID

lore
Share & tools
lore
#0 lore raw

Because of the removal the device list from the strips raid0 did not compile with MD_DEBUG flag on

 raid0.c |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

This Commit is stacked on top of:

	commit 747df02a154401948426050979b061446eadc37e
	Author: NeilBrown <[email protected]>
	Date:   Sat May 16 21:51:51 2009 +1000

all the reset of this patch set are on top of this commit
---

drivers/md/raid0.c +13 -7
index 86249c5..8049a92 100644
@@ -402,7 +402,7 @@ bad_map:
 	return 0;
 }
 
-static void raid0_status (struct seq_file *seq, mddev_t *mddev)
+static void raid0_status(struct seq_file *seq, mddev_t *mddev)
 {
 #undef MD_DEBUG
 #ifdef MD_DEBUG
@@ -410,18 +410,24 @@ static void raid0_status (struct seq_file *seq, mddev_t *mddev)
 	char b[BDEVNAME_SIZE];
 	raid0_conf_t *conf = mddev->private;
 
+	sector_t zone_size;
+	sector_t zone_start = 0;
 	h = 0;
+
 	for (j = 0; j < conf->nr_strip_zones; j++) {
 		seq_printf(seq, "      z%d", j);
 		seq_printf(seq, "=[");
 		for (k = 0; k < conf->strip_zone[j].nb_dev; k++)
 			seq_printf(seq, "%s/", bdevname(
-				conf->strip_zone[j].dev[k]->bdev,b));
-
-		seq_printf(seq, "] ze=%d ds=%d s=%d\n",
-				conf->strip_zone[j].zone_end,
-				conf->strip_zone[j].dev_start,
-				conf->strip_zone[j].sectors);
+				conf->devlist[j*mddesk->raid_disks + k]
+						->bdev, b));
+
+		zone_size  = conf->strip_zone[j].zone_end - zone_start;
+		seq_printf(seq, "] ze=%lld ds=%lld s=%lld\n",
+			(unsigned long long)zone_start>>1,
+			(unsigned long long)conf->strip_zone[j].dev_start>>1,
+			(unsigned long long)zone_size>>1);
+		zone_start = conf->strip_zone[j].zone_end;
 	}
 #endif
 	seq_printf(seq, " %dk chunks", mddev->chunk_size/1024);
#1 lore raw

drivers/md/raid0.c static void raid0_status (struct seq_file *seq, mddev_t *mddev) · line 422

Quoted 7 lines · On Tuesday May 19, [email protected] wrote:

Because of the removal the device list from the strips raid0 did not compile with MD_DEBUG flag on

drivers/md/raid0.c +1 -4
-		seq_printf(seq, "] ze=%d ds=%d s=%d\n",
-				conf->strip_zone[j].zone_end,
-				conf->strip_zone[j].dev_start,
-				conf->strip_zone[j].sectors);
+				conf->devlist[j*mddesk->raid_disks + k]
                                                ^^^^^^

You didn't compile test this, did you :-)
I've replaced that with mddev, and applied it.

Thanks.

NeilBrown

Quoted 17 lines
drivers/md/raid0.c +8 -1
+						->bdev, b));
+
+		zone_size  = conf->strip_zone[j].zone_end - zone_start;
+		seq_printf(seq, "] ze=%lld ds=%lld s=%lld\n",
+			(unsigned long long)zone_start>>1,
+			(unsigned long long)conf->strip_zone[j].dev_start>>1,
+			(unsigned long long)zone_size>>1);
+		zone_start = conf->strip_zone[j].zone_end;
 	}
 #endif
 	seq_printf(seq, " %dk chunks", mddev->chunk_size/1024);
 
 
--

To unsubscribe from this list: send the line "unsubscribe linux-raid" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html