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 | a471200595b24fb1907ad12107a6a66db02c63f2 (patch) | |
| tree | 55c04f45ca294cdd765d386a4f2539e4f4d7b069 /drivers/md/raid0.c | |
| parent | 1b7fdf8ff7c0e3fba9c679def4e98d5701d2949e (diff) | |
| download | linux-a471200595b24fb1907ad12107a6a66db02c63f2.tar.bz2 | |
md: raid0_make_request(): Remove local variable chunk_size.
We might as well use chunk_sects instead.
Signed-off-by: Andre Noll <maan@systemlinux.org>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/raid0.c')
| -rw-r--r-- | drivers/md/raid0.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index 62a193c2a25e..d8438494e9db 100644 --- 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, 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); |