Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21283916 authored Mar 02, 2009 by Swen Schillig Committed by James Bottomley Mar 12, 2009

[SCSI] zfcp: remove undefined subtype for status read response



The status read response FSF_STATUS_READ_SUB_ERROR_PORT is not
defined in the specs and therefore not valid.
All occurrences are removed from the code.

Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent 8fdf30d5

drivers/s390/scsi/zfcp_dbf.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -615,7 +615,7 @@ static const char *zfcp_rec_dbf_ids[] = {
	[119] = "unknown protocol status",		[119] = "unknown protocol status",
	[120] = "unknown fsf command",		[120] = "unknown fsf command",
	[121] = "no recommendation for status qualifier",		[121] = "no recommendation for status qualifier",
	[122] = "status read physical port closed in error",		[122] = "",
	[123] = "fc service class not supported",		[123] = "fc service class not supported",
	[124] = "",		[124] = "",
	[125] = "need newer zfcp",		[125] = "need newer zfcp",

drivers/s390/scsi/zfcp_fsf.c

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -162,14 +162,7 @@ static void zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *req)
	list_for_each_entry(port, &adapter->port_list_head, list)		list_for_each_entry(port, &adapter->port_list_head, list)
	if (port->d_id == d_id) {		if (port->d_id == d_id) {
	read_unlock_irqrestore(&zfcp_data.config_lock, flags);		read_unlock_irqrestore(&zfcp_data.config_lock, flags);
	switch (sr_buf->status_subtype) {
	case FSF_STATUS_READ_SUB_CLOSE_PHYS_PORT:
	zfcp_erp_port_reopen(port, 0, 101, req);		zfcp_erp_port_reopen(port, 0, 101, req);
	break;
	case FSF_STATUS_READ_SUB_ERROR_PORT:
	zfcp_erp_port_shutdown(port, 0, 122, req);
	break;
	}
	return;		return;
	}		}
	read_unlock_irqrestore(&zfcp_data.config_lock, flags);		read_unlock_irqrestore(&zfcp_data.config_lock, flags);

drivers/s390/scsi/zfcp_fsf.h

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -127,10 +127,6 @@
	#define FSF_STATUS_READ_CFDC_UPDATED 0x0000000A		#define FSF_STATUS_READ_CFDC_UPDATED 0x0000000A
	#define FSF_STATUS_READ_FEATURE_UPDATE_ALERT 0x0000000C		#define FSF_STATUS_READ_FEATURE_UPDATE_ALERT 0x0000000C

	/* status subtypes in status read buffer */
	#define FSF_STATUS_READ_SUB_CLOSE_PHYS_PORT 0x00000001
	#define FSF_STATUS_READ_SUB_ERROR_PORT 0x00000002

	/* status subtypes for link down */		/* status subtypes for link down */
	#define FSF_STATUS_READ_SUB_NO_PHYSICAL_LINK 0x00000000		#define FSF_STATUS_READ_SUB_NO_PHYSICAL_LINK 0x00000000
	#define FSF_STATUS_READ_SUB_FDISC_FAILED 0x00000001		#define FSF_STATUS_READ_SUB_FDISC_FAILED 0x00000001