From 3d7833f37d0fb206ec2b55606d7c8be8a3c6f727 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Fri, 9 Jan 2009 08:31:06 +1100 Subject: [PATCH] --- yaml --- r: 127718 b: refs/heads/master c: 1b7fdf8ff7c0e3fba9c679def4e98d5701d2949e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/raid0.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8f093d0762c1..b3bcdf3b4bc3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c3573f19d135d718264e38c46597295bd6154b7 +refs/heads/master: 1b7fdf8ff7c0e3fba9c679def4e98d5701d2949e diff --git a/trunk/drivers/md/raid0.c b/trunk/drivers/md/raid0.c index 8ac6488ad0dc..62a193c2a25e 100644 --- a/trunk/drivers/md/raid0.c +++ b/trunk/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;