Commit 74b2e047 authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: convert zfcp to use target reset and device reset handler 



[based on proposal from Mike Christie <michaelc@cs.wisc.edu>, this
patch adds some simplifications to the handler functions]

With the new target reset handler callback in the SCSI midlayer, the
device reset handler in zfcp can be split in two parts. Now, zfcp does
not have to track anymore whether the device supports LUN resets, so
remove this flag and let the SCSI midlayer decide what to do.

The device reset handler simply issues a LUN reset and the target
reset handler a target reset.

Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent ce545039

drivers/s390/scsi/zfcp_def.h

+0 −1
Original line number Diff line number Diff line
@@ -634,7 +634,6 @@ do { \ 
		 ZFCP_STATUS_PORT_NO_SCSI_ID)



/* logical unit status */

#define ZFCP_STATUS_UNIT_NOTSUPPUNITRESET	0x00000001

#define ZFCP_STATUS_UNIT_TEMPORARY		0x00000002

#define ZFCP_STATUS_UNIT_SHARED			0x00000004

#define ZFCP_STATUS_UNIT_READONLY		0x00000008

drivers/s390/scsi/zfcp_scsi.c

+20 −44
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *, 
				  void (*done) (struct scsi_cmnd *));

static int zfcp_scsi_eh_abort_handler(struct scsi_cmnd *);

static int zfcp_scsi_eh_device_reset_handler(struct scsi_cmnd *);

static int zfcp_scsi_eh_target_reset_handler(struct scsi_cmnd *);

static int zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *);

static int zfcp_task_management_function(struct zfcp_unit *, u8,

					 struct scsi_cmnd *);
@@ -51,6 +52,7 @@ struct zfcp_data zfcp_data = { 
		.queuecommand		= zfcp_scsi_queuecommand,

		.eh_abort_handler	= zfcp_scsi_eh_abort_handler,

		.eh_device_reset_handler = zfcp_scsi_eh_device_reset_handler,

		.eh_target_reset_handler = zfcp_scsi_eh_target_reset_handler,

		.eh_host_reset_handler	= zfcp_scsi_eh_host_reset_handler,

		.can_queue		= 4096,

		.this_id		= -1,
@@ -442,58 +444,32 @@ static int zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt) 
	return retval;

}



static int

zfcp_scsi_eh_device_reset_handler(struct scsi_cmnd *scpnt)

static int zfcp_scsi_eh_device_reset_handler(struct scsi_cmnd *scpnt)

{

	int retval;

	struct zfcp_unit *unit = (struct zfcp_unit *) scpnt->device->hostdata;

	struct zfcp_unit *unit = scpnt->device->hostdata;



	if (!unit) {

		ZFCP_LOG_NORMAL("bug: Tried reset for nonexistent unit\n");

		retval = SUCCESS;

		goto out;

		WARN_ON(1);

		return SUCCESS;

	}

	ZFCP_LOG_NORMAL("resetting unit 0x%016Lx on port 0x%016Lx, adapter %s\n",

			unit->fcp_lun, unit->port->wwpn,

			zfcp_get_busid_by_adapter(unit->port->adapter));



	/*

	 * If we do not know whether the unit supports 'logical unit reset'

	 * then try 'logical unit reset' and proceed with 'target reset'

	 * if 'logical unit reset' fails.

	 * If the unit is known not to support 'logical unit reset' then

	 * skip 'logical unit reset' and try 'target reset' immediately.

	 */

	if (!atomic_test_mask(ZFCP_STATUS_UNIT_NOTSUPPUNITRESET,

			      &unit->status)) {

	retval = zfcp_task_management_function(unit,

					       FCP_LOGICAL_UNIT_RESET,

					       scpnt);

		if (retval) {

			ZFCP_LOG_DEBUG("unit reset failed (unit=%p)\n", unit);

			if (retval == -ENOTSUPP)

				atomic_set_mask

				    (ZFCP_STATUS_UNIT_NOTSUPPUNITRESET,

				     &unit->status);

			/* fall through and try 'target reset' next */

		} else {

			ZFCP_LOG_DEBUG("unit reset succeeded (unit=%p)\n",

				       unit);

			/* avoid 'target reset' */

			retval = SUCCESS;

			goto out;

	return retval ? FAILED : SUCCESS;

}



static int zfcp_scsi_eh_target_reset_handler(struct scsi_cmnd *scpnt)

{

	int retval;

	struct zfcp_unit *unit = scpnt->device->hostdata;



	if (!unit) {

		WARN_ON(1);

		return SUCCESS;

	}

	retval = zfcp_task_management_function(unit, FCP_TARGET_RESET, scpnt);

	if (retval) {

		ZFCP_LOG_DEBUG("target reset failed (unit=%p)\n", unit);

		retval = FAILED;

	} else {

		ZFCP_LOG_DEBUG("target reset succeeded (unit=%p)\n", unit);

		retval = SUCCESS;

	}

 out:

	return retval;

	return retval ? FAILED : SUCCESS;

}



static int

CRA Git | Maintained and supported by SUSTech CRA and CCSE