diff options
| author | Dmitry Monakhov <dmonakhov@openvz.org> | 2017-06-29 20:31:11 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-07-04 00:56:24 +0200 |
| commit | e23947bd76f00701f9407af23e671f4da96f5f25 (patch) | |
| tree | 94f24da2825f34c411a31f4aa54564c2294aef1d /drivers/nvdimm/blk.c | |
| parent | bio-integrity: fix interface for bio_integrity_trim (diff) | |
| download | linux-e23947bd76f00701f9407af23e671f4da96f5f25.tar.xz 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 'drivers/nvdimm/blk.c')
| -rw-r--r-- | drivers/nvdimm/blk.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/nvdimm/blk.c b/drivers/nvdimm/blk.c index f12d23c49771..1a578b2a437b 100644 --- a/drivers/nvdimm/blk.c +++ b/drivers/nvdimm/blk.c @@ -179,16 +179,8 @@ static blk_qc_t nd_blk_make_request(struct request_queue *q, struct bio *bio) int err = 0, rw; bool do_acct; - /* - * bio_integrity_enabled also checks if the bio already has an - * integrity payload attached. If it does, we *don't* do a - * bio_integrity_prep here - the payload has been generated by - * another kernel subsystem, and we just pass it through. - */ - if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) { - bio->bi_status = BLK_STS_IOERR; - goto out; - } + if (!bio_integrity_prep(bio)) + return BLK_QC_T_NONE; bip = bio_integrity(bio); nsblk = q->queuedata; @@ -212,7 +204,6 @@ static blk_qc_t nd_blk_make_request(struct request_queue *q, struct bio *bio) if (do_acct) nd_iostat_end(bio, start); - out: bio_endio(bio); return BLK_QC_T_NONE; } |