diff options
| author |   Christoph Hellwig <hch@lst.de> | 2018-11-09 14:42:40 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2018-11-09 19:17:14 -0700 |
| commit | 4c1cb67c03511a4a404aaaeb206222d5bebdc4ca (patch) | |
| tree | e87a7fa009ac62e568d80cbd33a26eeaa219483f /drivers/scsi/device_handler/scsi_dh_rdac.c | |
| parent | scsi: return blk_status_t from scsi_init_io and ->init_command (diff) | |
| download | linux-dev-4c1cb67c03511a4a404aaaeb206222d5bebdc4ca.tar.xz linux-dev-4c1cb67c03511a4a404aaaeb206222d5bebdc4ca.zip | |
scsi: return blk_status_t from device handler ->prep_fn
Remove the last use of the old BLKPREP_* values, which get converted
to BLK_STS_* later anyway.
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/scsi/device_handler/scsi_dh_rdac.c')
| -rw-r--r-- | drivers/scsi/device_handler/scsi_dh_rdac.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c index d27fabae8ddd..65f1fe343c64 100644 --- a/drivers/scsi/device_handler/scsi_dh_rdac.c +++ b/drivers/scsi/device_handler/scsi_dh_rdac.c @@ -642,17 +642,16 @@ done: return 0; } -static int rdac_prep_fn(struct scsi_device *sdev, struct request *req) +static blk_status_t rdac_prep_fn(struct scsi_device *sdev, struct request *req) { struct rdac_dh_data *h = sdev->handler_data; - int ret = BLKPREP_OK; if (h->state != RDAC_STATE_ACTIVE) { - ret = BLKPREP_KILL; req->rq_flags |= RQF_QUIET; + return BLK_STS_IOERR; } - return ret; + return BLK_STS_OK; } static int rdac_check_sense(struct scsi_device *sdev, |