From 5b512499877bfe42fbed062ba40f23e642155bad Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Fri, 9 Jan 2009 08:31:06 +1100 Subject: [PATCH] --- yaml --- r: 127719 b: refs/heads/master c: a471200595b24fb1907ad12107a6a66db02c63f2 h: refs/heads/master i: 127717: 00c2eba01678fe1032837b2e611a0b6d5289c4bd 127715: a68c519e578edc07bbdecc387c22e501caa3aac3 127711: a18e85e6424d4259cb3f1e274420ba4a6ca0a762 v: v3 --- [refs] | 2 +- trunk/drivers/md/raid0.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b3bcdf3b4bc3..3eb69c53bbc1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b7fdf8ff7c0e3fba9c679def4e98d5701d2949e +refs/heads/master: a471200595b24fb1907ad12107a6a66db02c63f2 diff --git a/trunk/drivers/md/raid0.c b/trunk/drivers/md/raid0.c index 62a193c2a25e..d8438494e9db 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, chunksect_bits, chunk_size, chunk_sects; + unsigned int sect_in_chunk, chunksect_bits, chunk_sects; raid0_conf_t *conf = mddev_to_conf(mddev); struct strip_zone *zone; mdk_rdev_t *tmp_dev; @@ -407,7 +407,6 @@ static int raid0_make_request (struct request_queue *q, struct bio *bio) bio_sectors(bio)); part_stat_unlock(); - chunk_size = mddev->chunk_size >> 10; chunk_sects = mddev->chunk_size >> 9; chunksect_bits = ffz(~chunk_sects); block = bio->bi_sector >> 1; @@ -442,7 +441,7 @@ static int raid0_make_request (struct request_queue *q, struct bio *bio) while (block >= (zone->zone_offset + zone->size)) zone++; - sect_in_chunk = bio->bi_sector & ((chunk_size<<1) -1); + sect_in_chunk = bio->bi_sector & (chunk_sects - 1); { @@ -467,7 +466,7 @@ static int raid0_make_request (struct request_queue *q, struct bio *bio) bad_map: printk("raid0_make_request bug: can't convert block across chunks" - " or bigger than %dk %llu %d\n", chunk_size, + " or bigger than %dk %llu %d\n", chunk_sects / 2, (unsigned long long)bio->bi_sector, bio->bi_size >> 10); bio_io_error(bio);