From 83838ed87898e0a8ff8dbf001e54e6c017f0a011 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Fri, 9 Jan 2009 08:31:07 +1100 Subject: md: raid0: Represent the size of strip zones in sectors. This completes the block -> sector conversion of struct strip_zone. Signed-off-by: Andre Noll Signed-off-by: NeilBrown --- drivers/md/raid0.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'drivers') diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index c759436b5d84..6e85e88bbae9 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c @@ -156,11 +156,11 @@ static int create_strip_zones (mddev_t *mddev) goto abort; } zone->nb_dev = cnt; - zone->size = smallest->size * cnt; + zone->sectors = smallest->size * cnt * 2; zone->zone_start = 0; current_start = smallest->size * 2; - curr_zone_start = zone->size * 2; + curr_zone_start = zone->sectors; /* now do the other zones */ for (i = 1; i < conf->nr_strip_zones; i++) @@ -193,12 +193,12 @@ static int create_strip_zones (mddev_t *mddev) } zone->nb_dev = c; - zone->size = (smallest->size - current_start / 2) * c; - printk(KERN_INFO "raid0: zone->nb_dev: %d, size: %llu\n", - zone->nb_dev, (unsigned long long)zone->size); + zone->sectors = (smallest->size * 2 - current_start) * c; + printk(KERN_INFO "raid0: zone->nb_dev: %d, sectors: %llu\n", + zone->nb_dev, (unsigned long long)zone->sectors); zone->zone_start = curr_zone_start; - curr_zone_start += zone->size * 2; + curr_zone_start += zone->sectors; current_start = smallest->size * 2; printk(KERN_INFO "raid0: current zone start: %llu\n", @@ -220,7 +220,7 @@ static int create_strip_zones (mddev_t *mddev) sector_t sz = 0; for (j=i; jnr_strip_zones-1 && sz < min_spacing ; j++) - sz += conf->strip_zone[j].size; + sz += conf->strip_zone[j].sectors / 2; if (sz >= min_spacing && sz < conf->hash_spacing) conf->hash_spacing = sz; } @@ -325,13 +325,13 @@ static int raid0_run (mddev_t *mddev) conf->hash_table = kmalloc (sizeof (struct strip_zone *)*nb_zone, GFP_KERNEL); if (!conf->hash_table) goto out_free_conf; - size = conf->strip_zone[cur].size; + size = conf->strip_zone[cur].sectors / 2; conf->hash_table[0] = conf->strip_zone + cur; for (i=1; i< nb_zone; i++) { while (size <= conf->hash_spacing) { cur++; - size += conf->strip_zone[cur].size; + size += conf->strip_zone[cur].sectors / 2; } size -= conf->hash_spacing; conf->hash_table[i] = conf->strip_zone + cur; @@ -439,10 +439,10 @@ static int raid0_make_request (struct request_queue *q, struct bio *bio) sector_div(x, (u32)conf->hash_spacing); zone = conf->hash_table[x]; } - - while (sector / 2 >= (zone->zone_start / 2 + zone->size)) + + while (sector >= zone->zone_start + zone->sectors) zone++; - + sect_in_chunk = bio->bi_sector & (chunk_sects - 1); @@ -495,7 +495,7 @@ static void raid0_status (struct seq_file *seq, mddev_t *mddev) seq_printf(seq, "] zs=%d ds=%d s=%d\n", conf->strip_zone[j].zone_start, conf->strip_zone[j].dev_start, - conf->strip_zone[j].size); + conf->strip_zone[j].sectors); } #endif seq_printf(seq, " %dk chunks", mddev->chunk_size/1024); -- cgit v1.2.3