diff options
| author | Jens Axboe <axboe@fb.com> | 2014-06-10 20:53:56 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-06-10 20:53:56 +0200 |
| commit | 58a4915ad2f8a87f4456aac260396df7e300e6f2 (patch) | |
| tree | 6481a87de33d3caa7b647c3347324eea1c474216 /block/bio.c | |
| parent | blk-mq: add timer in blk_mq_start_request (diff) | |
| download | linux-58a4915ad2f8a87f4456aac260396df7e300e6f2.tar.xz linux-58a4915ad2f8a87f4456aac260396df7e300e6f2.zip | |
block: ensure that bio_add_page() always accepts a page for an empty bio
With commit 762380ad9322 added support for chunk sizes and no merging
across them, it broke the rule of always allowing adding of a single
page to an empty bio. So relax the restriction a bit to allow for that,
similarly to what we have always done.
This fixes a crash with mkfs.xfs and 512b sector sizes on NVMe.
Reported-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/bio.c')
| -rw-r--r-- | block/bio.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/block/bio.c b/block/bio.c index 97e832cc9b9c..2d64488e51c6 100644 --- a/block/bio.c +++ b/block/bio.c @@ -849,8 +849,13 @@ int bio_add_page(struct bio *bio, struct page *page, unsigned int len, unsigned int offset) { struct request_queue *q = bdev_get_queue(bio->bi_bdev); + unsigned int max_sectors; - return __bio_add_page(q, bio, page, len, offset, blk_max_size_offset(q, bio->bi_iter.bi_sector)); + max_sectors = blk_max_size_offset(q, bio->bi_iter.bi_sector); + if ((max_sectors < (len >> 9)) && !bio->bi_iter.bi_size) + max_sectors = len >> 9; + + return __bio_add_page(q, bio, page, len, offset, max_sectors); } EXPORT_SYMBOL(bio_add_page); |