From: Omar Sandoval Date: Tue, 15 Nov 2016 19:11:59 +0000 (-0800) Subject: scsi_lib: untangle 0 and BLK_MQ_RQ_QUEUE_OK X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2868f13c303e1472bfd3941c62916c1f4128a713;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Jens Axboe --- diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 2e35132f8be1..47a5c8783b89 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1810,7 +1810,7 @@ static inline int prep_to_mq(int ret) { switch (ret) { case BLKPREP_OK: - return 0; + return BLK_MQ_RQ_QUEUE_OK; case BLKPREP_DEFER: return BLK_MQ_RQ_QUEUE_BUSY; default: @@ -1897,7 +1897,7 @@ static int scsi_queue_rq(struct blk_mq_hw_ctx *hctx, int reason; ret = prep_to_mq(scsi_prep_state_check(sdev, req)); - if (ret) + if (ret != BLK_MQ_RQ_QUEUE_OK) goto out; 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)) { ret = prep_to_mq(scsi_mq_prep_fn(req)); - if (ret) + if (ret != BLK_MQ_RQ_QUEUE_OK) goto out_dec_host_busy; req->rq_flags |= RQF_DONTPREP; } else {