md: raid0_make_request(): Replace chunksize_bits by chunksect_bits.

As ffz(~(2 * x)) = ffz(~x) + 1, we have

	chunksect_bits = chunksize_bits + 1.

Fixup all users accordingly.

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 8ac6488ad0dc6c1a86463c4e732c1205a6cbb9a3..62a193c2a25e7a66e0f195ebe28c75c06af31fd0 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -387,7 +387,7 @@ static int raid0_stop (mddev_t *mddev)
 static int raid0_make_request (struct request_queue *q, struct bio *bio)
 {
        mddev_t *mddev = q->queuedata;
-       unsigned int sect_in_chunk, chunksize_bits,  chunk_size, chunk_sects;
+       unsigned int sect_in_chunk, chunksect_bits, chunk_size, chunk_sects;
        raid0_conf_t *conf = mddev_to_conf(mddev);
        struct strip_zone *zone;
        mdk_rdev_t *tmp_dev;
@@ -409,7 +409,7 @@ static int raid0_make_request (struct request_queue *q, struct bio *bio)
 
        chunk_size = mddev->chunk_size >> 10;
        chunk_sects = mddev->chunk_size >> 9;
-       chunksize_bits = ffz(~chunk_size);
+       chunksect_bits = ffz(~chunk_sects);
        block = bio->bi_sector >> 1;
        
 
@@ -446,15 +446,15 @@ static int raid0_make_request (struct request_queue *q, struct bio *bio)
 
 
        {
-               sector_t x =  (block - zone->zone_offset) >> chunksize_bits;
+               sector_t x =  (block - zone->zone_offset) >> (chunksect_bits - 1);
 
                sector_div(x, zone->nb_dev);
                chunk = x;
 
-               x = block >> chunksize_bits;
+               x = block >> (chunksect_bits - 1);
                tmp_dev = zone->dev[sector_div(x, zone->nb_dev)];
        }
-       rsect = (((chunk << chunksize_bits) + zone->dev_offset)<<1)
+       rsect = (((chunk << (chunksect_bits - 1)) + zone->dev_offset)<<1)
                + sect_in_chunk;
  
        bio->bi_bdev = tmp_dev->bdev;