diff options
| author | Dmitry Monakhov <dmonakhov@openvz.org> | 2017-06-29 11:31:11 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-07-03 16:56:24 -0600 |
| commit | e23947bd76f00701f9407af23e671f4da96f5f25 (patch) | |
| tree | 94f24da2825f34c411a31f4aa54564c2294aef1d /block/blk-mq.c | |
| parent | fbd08e7673f950854679e5d79a30bb25e77a9d08 (diff) | |
| download | linux-e23947bd76f00701f9407af23e671f4da96f5f25.tar.gz linux-e23947bd76f00701f9407af23e671f4da96f5f25.tar.bz2 linux-e23947bd76f00701f9407af23e671f4da96f5f25.zip | |
bio-integrity: fold bio_integrity_enabled to bio_integrity_prep
Currently all integrity prep hooks are open-coded, and if prepare fails
we ignore it's code and fail bio with EIO. Let's return real error to
upper layer, so later caller may react accordingly.
In fact no one want to use bio_integrity_prep() w/o bio_integrity_enabled,
so it is reasonable to fold it in to one function.
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
[hch: merged with the latest block tree,
return bool from bio_integrity_prep]
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index ced2b000ca02..77617fb12661 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1550,10 +1550,8 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) blk_queue_split(q, &bio); - if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) { - bio_io_error(bio); + if (!bio_integrity_prep(bio)) return BLK_QC_T_NONE; - } if (!is_flush_fua && !blk_queue_nomerges(q) && blk_attempt_plug_merge(q, bio, &request_count, &same_queue_rq)) |