diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2009-03-16 17:44:30 +0000 |
|---|---|---|
| committer | Alasdair G Kergon <agk@redhat.com> | 2009-03-16 17:44:30 +0000 |
| commit | d659e6cc98766a1a61d6bdd283f95d149abd7719 (patch) | |
| tree | 6bed5b474d50d345a2d16562cf521d7bfa7243b8 /drivers/md/dm-io.c | |
| parent | f80a557008462a0a4adef25407f1872e793d8dd5 (diff) | |
| download | op-kernel-dev-d659e6cc98766a1a61d6bdd283f95d149abd7719.zip op-kernel-dev-d659e6cc98766a1a61d6bdd283f95d149abd7719.tar.gz | |
dm io: respect BIO_MAX_PAGES limit
dm-io calls bio_get_nr_vecs to get the maximum number of pages to use
for a given device. It allocates one additional bio_vec to use
internally but failed to respect BIO_MAX_PAGES, so fix this.
This was the likely cause of:
https://bugzilla.redhat.com/show_bug.cgi?id=173153
Cc: stable@kernel.org
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md/dm-io.c')
| -rw-r--r-- | drivers/md/dm-io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c index f14813b..36e2b5e 100644 --- a/drivers/md/dm-io.c +++ b/drivers/md/dm-io.c @@ -292,6 +292,8 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where, (PAGE_SIZE >> SECTOR_SHIFT)); num_bvecs = 1 + min_t(int, bio_get_nr_vecs(where->bdev), num_bvecs); + if (unlikely(num_bvecs > BIO_MAX_PAGES)) + num_bvecs = BIO_MAX_PAGES; bio = bio_alloc_bioset(GFP_NOIO, num_bvecs, io->client->bios); bio->bi_sector = where->sector + (where->count - remaining); bio->bi_bdev = where->bdev; |
