From c94a63d6597dba06381f1f2c8817bc4ec52b34b6 Mon Sep 17 00:00:00 2001 From: Jun'ichi Nomura Date: Thu, 12 Jul 2007 17:27:45 +0100 Subject: [PATCH] --- yaml --- r: 59282 b: refs/heads/master c: 596f138eede0c113aa655937c8be85fc15ccd61c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-io.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 65027ca8b3a9..20bf94f1fea4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c95bc206da4bc9838bad826883f8f461a972e441 +refs/heads/master: 596f138eede0c113aa655937c8be85fc15ccd61c diff --git a/trunk/drivers/md/dm-io.c b/trunk/drivers/md/dm-io.c index 352c6fbeac53..f3a772486437 100644 --- a/trunk/drivers/md/dm-io.c +++ b/trunk/drivers/md/dm-io.c @@ -293,7 +293,10 @@ static void do_region(int rw, unsigned int region, struct io_region *where, * bvec for bio_get/set_region() and decrement bi_max_vecs * to hide it from bio_add_page(). */ - num_bvecs = (remaining / (PAGE_SIZE >> SECTOR_SHIFT)) + 2; + num_bvecs = dm_sector_div_up(remaining, + (PAGE_SIZE >> SECTOR_SHIFT)); + num_bvecs = 1 + min_t(int, bio_get_nr_vecs(where->bdev), + num_bvecs); bio = bio_alloc_bioset(GFP_NOIO, num_bvecs, io->client->bios); bio->bi_sector = where->sector + (where->count - remaining); bio->bi_bdev = where->bdev;