dm io: fix another panic on large request
bio_alloc_bioset() will return NULL if 'num_vecs' is too large. Use bio_get_nr_vecs() to get estimation of maximum number. Signed-off-by: Junichi Nomura <j-nomura@ce.jp.nec.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
74ff092c25
commit
3bca2f5571
+4
-1
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user