diff options
| author | Andre Noll <maan@systemlinux.org> | 2009-01-09 08:31:06 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2009-01-09 08:31:06 +1100 |
| commit | 019c4e2f3e02aac4b44003913b54ca4b332e4371 (patch) | |
| tree | ebdd73075be543d5feb1a1e86a793a2b3311ea9b | |
| parent | e0f06868341700c5c1964a04f6c5b51d0a2d5bca (diff) | |
| download | linux-019c4e2f3e02aac4b44003913b54ca4b332e4371.tar.bz2 | |
md: raid0: Represent device offset in sectors.
Rename zone->dev_offset to zone->dev_start to make sure all users
have been converted.
Signed-off-by: Andre Noll <maan@systemlinux.org>
Signed-off-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | drivers/md/raid0.c | 9 | ||||
| -rw-r--r-- | include/linux/raid/raid0.h | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index fd65d8806c0f..b860536dc894 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c @@ -167,7 +167,7 @@ static int create_strip_zones (mddev_t *mddev) zone->dev = conf->strip_zone[i-1].dev + mddev->raid_disks; printk("raid0: zone %d\n", i); - zone->dev_offset = current_offset; + zone->dev_start = current_offset * 2; smallest = NULL; c = 0; @@ -452,8 +452,7 @@ static int raid0_make_request (struct request_queue *q, struct bio *bio) x = sector >> chunksect_bits; tmp_dev = zone->dev[sector_div(x, zone->nb_dev)]; } - rsect = (((chunk << (chunksect_bits - 1)) + zone->dev_offset)<<1) - + sect_in_chunk; + rsect = (chunk << chunksect_bits) + zone->dev_start + sect_in_chunk; bio->bi_bdev = tmp_dev->bdev; bio->bi_sector = rsect + tmp_dev->data_offset; @@ -490,9 +489,9 @@ static void raid0_status (struct seq_file *seq, mddev_t *mddev) seq_printf(seq, "%s/", bdevname( conf->strip_zone[j].dev[k]->bdev,b)); - seq_printf(seq, "] zo=%d do=%d s=%d\n", + seq_printf(seq, "] zo=%d ds=%d s=%d\n", conf->strip_zone[j].zone_offset, - conf->strip_zone[j].dev_offset, + conf->strip_zone[j].dev_start, conf->strip_zone[j].size); } #endif diff --git a/include/linux/raid/raid0.h b/include/linux/raid/raid0.h index 1b2dda035f8e..61c3d29dc158 100644 --- a/include/linux/raid/raid0.h +++ b/include/linux/raid/raid0.h @@ -6,7 +6,7 @@ struct strip_zone { sector_t zone_offset; /* Zone offset in md_dev */ - sector_t dev_offset; /* Zone offset in real dev */ + sector_t dev_start; /* Zone offset in real dev (in sectors) */ sector_t size; /* Zone size */ int nb_dev; /* # of devices attached to the zone */ mdk_rdev_t **dev; /* Devices attached to the zone */ |