adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

md: raid0: Represent zone->zone_offset in sectors.

Browse source 
For the same reason as in the previous patch, rename it from zone_offset
to zone_start.

Signed-off-by: Andre Noll <maan@systemlinux.org>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Andre Noll 2009-01-09 08:31:07 +11:00 committed by NeilBrown
parent 019c4e2f3e
commit 6199d3db0f
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/md/raid0.c
View file

@ -155,7 +155,7 @@ static int create_strip_zones (mddev_t *mddev)
} }
zone->nb_dev = cnt; zone->nb_dev = cnt;
zone->size = smallest->size * cnt; zone->size = smallest->size * cnt;
zone->zone_offset = 0; zone->zone_start = 0;
current_offset = smallest->size; current_offset = smallest->size;
curr_zone_offset = zone->size; curr_zone_offset = zone->size;
@ -194,7 +194,7 @@ static int create_strip_zones (mddev_t *mddev)
printk("raid0: zone->nb_dev: %d, size: %llu\n", printk("raid0: zone->nb_dev: %d, size: %llu\n",
zone->nb_dev, (unsigned long long)zone->size); zone->nb_dev, (unsigned long long)zone->size);
zone->zone_offset = curr_zone_offset; zone->zone_start = curr_zone_offset * 2;
curr_zone_offset += zone->size; curr_zone_offset += zone->size;
current_offset = smallest->size; current_offset = smallest->size;
@ -437,14 +437,14 @@ static int raid0_make_request (struct request_queue *q, struct bio *bio)
zone = conf->hash_table[x]; zone = conf->hash_table[x];
} }
while (sector / 2 >= (zone->zone_offset + zone->size)) while (sector / 2 >= (zone->zone_start / 2 + zone->size))
zone++; zone++;
sect_in_chunk = bio->bi_sector & (chunk_sects - 1); sect_in_chunk = bio->bi_sector & (chunk_sects - 1);
{ {
sector_t x = (sector - zone->zone_offset * 2) >> chunksect_bits; sector_t x = (sector - zone->zone_start) >> chunksect_bits;
sector_div(x, zone->nb_dev); sector_div(x, zone->nb_dev);
chunk = x; chunk = x;
@ -489,8 +489,8 @@ static void raid0_status (struct seq_file *seq, mddev_t *mddev)
seq_printf(seq, "%s/", bdevname( seq_printf(seq, "%s/", bdevname(
conf->strip_zone[j].dev[k]->bdev,b)); conf->strip_zone[j].dev[k]->bdev,b));
seq_printf(seq, "] zo=%d ds=%d s=%d\n", seq_printf(seq, "] zs=%d ds=%d s=%d\n",
conf->strip_zone[j].zone_offset, conf->strip_zone[j].zone_start,
conf->strip_zone[j].dev_start, conf->strip_zone[j].dev_start,
conf->strip_zone[j].size); conf->strip_zone[j].size);
} }

2
include/linux/raid/raid0.h
View file

@ -5,7 +5,7 @@
struct strip_zone struct strip_zone
{ {
sector_t zone_offset; /* Zone offset in md_dev */ sector_t zone_start; /* Zone offset in md_dev (in sectors) */
sector_t dev_start; /* Zone offset in real dev (in sectors) */ sector_t dev_start; /* Zone offset in real dev (in sectors) */
sector_t size; /* Zone size */ sector_t size; /* Zone size */
int nb_dev; /* # of devices attached to the zone */ int nb_dev; /* # of devices attached to the zone */