block: ensure that bio_add_page() always accepts a page for an empty bio
authorJens Axboe <axboe@fb.com>
Tue, 10 Jun 2014 18:53:56 +0000 (12:53 -0600)
committerJens Axboe <axboe@fb.com>
Tue, 10 Jun 2014 18:53:56 +0000 (12:53 -0600)
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>
block/bio.c
block/blk-settings.c

diff --cc block/bio.c
Simple merge
Simple merge