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>

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index fd65d8806c0f98cd8489acd93ac22c9c4a796a63..b860536dc894b4c0d4fa122bf142d8e823a9604a 100644 (file)
--- 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 1b2dda035f8efcfeb5e979ed463d735e9f3f70b1..61c3d29dc158304808dd0f2ba8693396ce754e44 100644 (file)
--- 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 */