Commit 4c1cb67c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 159b2cbf

drivers/scsi/device_handler/scsi_dh_alua.c

+11 −10
Original line number Diff line number Diff line
@@ -1071,28 +1071,29 @@ static void alua_check(struct scsi_device *sdev, bool force) 
 * Fail I/O to all paths not in state

 * active/optimized or active/non-optimized.

 */

static int alua_prep_fn(struct scsi_device *sdev, struct request *req)

static blk_status_t alua_prep_fn(struct scsi_device *sdev, struct request *req)

{

	struct alua_dh_data *h = sdev->handler_data;

	struct alua_port_group *pg;

	unsigned char state = SCSI_ACCESS_STATE_OPTIMAL;

	int ret = BLKPREP_OK;



	rcu_read_lock();

	pg = rcu_dereference(h->pg);

	if (pg)

		state = pg->state;

	rcu_read_unlock();

	if (state == SCSI_ACCESS_STATE_TRANSITIONING)

		ret = BLKPREP_DEFER;

	else if (state != SCSI_ACCESS_STATE_OPTIMAL &&

		 state != SCSI_ACCESS_STATE_ACTIVE &&

		 state != SCSI_ACCESS_STATE_LBA) {

		ret = BLKPREP_KILL;



	switch (state) {

	case SCSI_ACCESS_STATE_OPTIMAL:

	case SCSI_ACCESS_STATE_ACTIVE:

	case SCSI_ACCESS_STATE_LBA:

		return BLK_STS_OK;

	case SCSI_ACCESS_STATE_TRANSITIONING:

		return BLK_STS_RESOURCE;

	default:

		req->rq_flags |= RQF_QUIET;

		return BLK_STS_IOERR;

	}

	return ret;



}



static void alua_rescan(struct scsi_device *sdev)

drivers/scsi/device_handler/scsi_dh_emc.c

+4 −4
Original line number Diff line number Diff line
@@ -341,17 +341,17 @@ static int clariion_check_sense(struct scsi_device *sdev, 
	return SCSI_RETURN_NOT_HANDLED;

}



static int clariion_prep_fn(struct scsi_device *sdev, struct request *req)

static blk_status_t clariion_prep_fn(struct scsi_device *sdev,

		struct request *req)

{

	struct clariion_dh_data *h = sdev->handler_data;

	int ret = BLKPREP_OK;



	if (h->lun_state != CLARIION_LUN_OWNED) {

		ret = BLKPREP_KILL;

		req->rq_flags |= RQF_QUIET;

		return BLK_STS_IOERR;

	}

	return ret;



	return BLK_STS_OK;

}



static int clariion_std_inquiry(struct scsi_device *sdev,

drivers/scsi/device_handler/scsi_dh_hp_sw.c

+3 −4
Original line number Diff line number Diff line
@@ -172,17 +172,16 @@ retry: 
	return rc;

}



static int hp_sw_prep_fn(struct scsi_device *sdev, struct request *req)

static blk_status_t hp_sw_prep_fn(struct scsi_device *sdev, struct request *req)

{

	struct hp_sw_dh_data *h = sdev->handler_data;

	int ret = BLKPREP_OK;



	if (h->path_state != HP_SW_PATH_ACTIVE) {

		ret = BLKPREP_KILL;

		req->rq_flags |= RQF_QUIET;

		return BLK_STS_IOERR;

	}

	return ret;



	return BLK_STS_OK;

}



/*

drivers/scsi/device_handler/scsi_dh_rdac.c

+3 −4
Original line number Diff line number Diff line
@@ -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,

drivers/scsi/scsi_lib.c

+3 −15
Original line number Diff line number Diff line
@@ -1177,18 +1177,6 @@ void scsi_init_command(struct scsi_device *dev, struct scsi_cmnd *cmd) 
	scsi_add_cmd_to_list(cmd);

}



static inline blk_status_t prep_to_mq(int ret)

{

	switch (ret) {

	case BLKPREP_OK:

		return BLK_STS_OK;

	case BLKPREP_DEFER:

		return BLK_STS_RESOURCE;

	default:

		return BLK_STS_IOERR;

	}

}



static blk_status_t scsi_setup_scsi_cmnd(struct scsi_device *sdev,

		struct request *req)

{
@@ -1227,9 +1215,9 @@ static blk_status_t scsi_setup_fs_cmnd(struct scsi_device *sdev, 
	struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(req);



	if (unlikely(sdev->handler && sdev->handler->prep_fn)) {

		int ret = sdev->handler->prep_fn(sdev, req);

		if (ret != BLKPREP_OK)

			return prep_to_mq(ret);

		blk_status_t ret = sdev->handler->prep_fn(sdev, req);

		if (ret != BLK_STS_OK)

			return ret;

	}



	cmd->cmnd = scsi_req(req)->cmd = scsi_req(req)->__cmd;

CRA Git | Maintained and supported by SUSTech CRA and CCSE