diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2009-03-16 17:44:30 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-23 15:00:00 -0700 |
| commit | 49838e7c80ce1bf98ac567c5b7131ac9992b5043 (patch) | |
| tree | 2960dd5d4014c673508b5da8def5495557edcd96 /drivers | |
| parent | e6e775fcaef2b0d5cb50dbc709bfa7f07762c3a6 (diff) | |
| download | lwn-49838e7c80ce1bf98ac567c5b7131ac9992b5043.tar.gz lwn-49838e7c80ce1bf98ac567c5b7131ac9992b5043.zip | |
dm io: respect BIO_MAX_PAGES limit
commit d659e6cc98766a1a61d6bdd283f95d149abd7719 upstream.
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
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -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 4789c42d9a3a..427e5ed0af5f 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; |