hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi_lib: untangle 0 and BLK_MQ_RQ_QUEUE_OK 

Let's not depend on any of the BLK_MQ_RQ_QUEUE_* constants having
specific values. No functional change.

Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Omar Sandoval 2016-11-15 11:11:59 -08:00 committed by Jens Axboe
parent bac0000af5
commit 2868f13c30
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/scsi_lib.c
View File

@ -1810,7 +1810,7 @@ static inline int prep_to_mq(int ret)
{ {
switch (ret) { switch (ret) {
case BLKPREP_OK: case BLKPREP_OK:
return 0; return BLK_MQ_RQ_QUEUE_OK;
case BLKPREP_DEFER: case BLKPREP_DEFER:
return BLK_MQ_RQ_QUEUE_BUSY; return BLK_MQ_RQ_QUEUE_BUSY;
default: default:
@ -1897,7 +1897,7 @@ static int scsi_queue_rq(struct blk_mq_hw_ctx *hctx,
int reason; int reason;
ret = prep_to_mq(scsi_prep_state_check(sdev, req)); ret = prep_to_mq(scsi_prep_state_check(sdev, req));
if (ret) if (ret != BLK_MQ_RQ_QUEUE_OK)
goto out; goto out;
ret = BLK_MQ_RQ_QUEUE_BUSY; ret = BLK_MQ_RQ_QUEUE_BUSY;
@ -1914,7 +1914,7 @@ static int scsi_queue_rq(struct blk_mq_hw_ctx *hctx,
if (!(req->rq_flags & RQF_DONTPREP)) { if (!(req->rq_flags & RQF_DONTPREP)) {
ret = prep_to_mq(scsi_mq_prep_fn(req)); ret = prep_to_mq(scsi_mq_prep_fn(req));
if (ret) if (ret != BLK_MQ_RQ_QUEUE_OK)
goto out_dec_host_busy; goto out_dec_host_busy;
req->rq_flags |= RQF_DONTPREP; req->rq_flags |= RQF_DONTPREP;
} else { } else {