diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-07-03 05:24:35 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-07-03 07:20:40 -0600 |
| commit | d665e12aa713e598a1100a320e5679c3f73823ed (patch) | |
| tree | a4a586de3a4566a4f412a487fac06cfb1f1fd060 /block/blk-merge.c | |
| parent | 970d168de636ddac8221cbd4a11d7678943e7379 (diff) | |
| download | linux-stable-d665e12aa713e598a1100a320e5679c3f73823ed.tar.gz linux-stable-d665e12aa713e598a1100a320e5679c3f73823ed.tar.bz2 linux-stable-d665e12aa713e598a1100a320e5679c3f73823ed.zip | |
block: nr_phys_segments needs to be zero for REQ_OP_WRITE_ZEROES
Fix a regression introduced when removing bi_phys_segments for Write Zeroes
requests, which need to have a segment count of zero, as they don't have a
payload.
Fixes: 14ccb66b3f58 ("block: remove the bi_phys_segments field in struct bio")
Reported-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index ca45eb51c669..57f7990b342d 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -105,7 +105,7 @@ static struct bio *blk_bio_discard_split(struct request_queue *q, static struct bio *blk_bio_write_zeroes_split(struct request_queue *q, struct bio *bio, struct bio_set *bs, unsigned *nsegs) { - *nsegs = 1; + *nsegs = 0; if (!q->limits.max_write_zeroes_sectors) return NULL; |