diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-06-03 09:38:05 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-06-09 09:27:32 -0600 |
| commit | fc17b6534eb8395f0b3133eb31d87deec32c642b (patch) | |
| tree | 18686a2326ebd60d68f144c70f83f4441c6b4e2f /drivers/mtd/ubi | |
| parent | 2a842acab109f40f0d7d10b38e9ca88390628996 (diff) | |
| download | talos-obmc-linux-fc17b6534eb8395f0b3133eb31d87deec32c642b.tar.gz talos-obmc-linux-fc17b6534eb8395f0b3133eb31d87deec32c642b.zip | |
blk-mq: switch ->queue_rq return value to blk_status_t
Use the same values for use for request completion errors as the return
value from ->queue_rq. BLK_STS_RESOURCE is special cased to cause
a requeue, and all the others are completed as-is.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/mtd/ubi')
| -rw-r--r-- | drivers/mtd/ubi/block.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c index 3ecdb39d1985..c3963f880448 100644 --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c @@ -316,7 +316,7 @@ static void ubiblock_do_work(struct work_struct *work) blk_mq_end_request(req, errno_to_blk_status(ret)); } -static int ubiblock_queue_rq(struct blk_mq_hw_ctx *hctx, +static blk_status_t ubiblock_queue_rq(struct blk_mq_hw_ctx *hctx, const struct blk_mq_queue_data *bd) { struct request *req = bd->rq; @@ -327,9 +327,9 @@ static int ubiblock_queue_rq(struct blk_mq_hw_ctx *hctx, case REQ_OP_READ: ubi_sgl_init(&pdu->usgl); queue_work(dev->wq, &pdu->work); - return BLK_MQ_RQ_QUEUE_OK; + return BLK_STS_OK; default: - return BLK_MQ_RQ_QUEUE_ERROR; + return BLK_STS_IOERR; } } |
