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

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

[SCSI] zfcp: Remove flag ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP 



The flag ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP is never set and hence can
be removed. This is a leftover from the time when zfcp had to decide
whether the target supports a "logical unit reset" or not. Nowadays,
the SCSI midlayer calls the eh_device_reset_handler or the
eh_target_reset_handler and zfcp simply maps this to a "logical unit
reset" or a "target reset".

Reviewed-by: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 0fdd2133

drivers/s390/scsi/zfcp_def.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -111,7 +111,6 @@ 
#define ZFCP_STATUS_FSFREQ_ABORTSUCCEEDED	0x00000040

#define ZFCP_STATUS_FSFREQ_ABORTSUCCEEDED	0x00000040

#define ZFCP_STATUS_FSFREQ_ABORTNOTNEEDED       0x00000080

#define ZFCP_STATUS_FSFREQ_ABORTNOTNEEDED       0x00000080

#define ZFCP_STATUS_FSFREQ_TMFUNCFAILED         0x00000200

#define ZFCP_STATUS_FSFREQ_TMFUNCFAILED         0x00000200

#define ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP        0x00000400

#define ZFCP_STATUS_FSFREQ_DISMISSED            0x00001000

#define ZFCP_STATUS_FSFREQ_DISMISSED            0x00001000





/************************* STRUCTURE DEFINITIONS *****************************/

/************************* STRUCTURE DEFINITIONS *****************************/

drivers/s390/scsi/zfcp_scsi.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -264,9 +264,6 @@ static int zfcp_task_mgmt_function(struct scsi_cmnd *scpnt, u8 tm_flags) 
	if (fsf_req->status & ZFCP_STATUS_FSFREQ_TMFUNCFAILED) {

	if (fsf_req->status & ZFCP_STATUS_FSFREQ_TMFUNCFAILED) {

		zfcp_dbf_scsi_devreset("fail", tm_flags, unit, scpnt);

		zfcp_dbf_scsi_devreset("fail", tm_flags, unit, scpnt);

		retval = FAILED;

		retval = FAILED;

	} else if (fsf_req->status & ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP) {

		zfcp_dbf_scsi_devreset("nsup", tm_flags, unit, scpnt);

		retval = FAILED;

	} else

	} else

		zfcp_dbf_scsi_devreset("okay", tm_flags, unit, scpnt);

		zfcp_dbf_scsi_devreset("okay", tm_flags, unit, scpnt);