diff options
author | Christof Schmitt <christof.schmitt@de.ibm.com> | 2009-11-24 10:54:18 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2009-12-04 13:02:18 -0500 |
commit | 54987386ee3790f3900de4df2ed4deb0e18dfc9f (patch) | |
tree | a73d7975dadda2fb66c27883dc692de2e09b734c | |
parent | 0fdd21330a9d7bc6790eae0aed768052c315ae44 (diff) |
[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: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-rw-r--r-- | drivers/s390/scsi/zfcp_def.h | 1 | ||||
-rw-r--r-- | drivers/s390/scsi/zfcp_scsi.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index e43c6334bf69..e1b5b88e2ddb 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h | |||
@@ -111,7 +111,6 @@ | |||
111 | #define ZFCP_STATUS_FSFREQ_ABORTSUCCEEDED 0x00000040 | 111 | #define ZFCP_STATUS_FSFREQ_ABORTSUCCEEDED 0x00000040 |
112 | #define ZFCP_STATUS_FSFREQ_ABORTNOTNEEDED 0x00000080 | 112 | #define ZFCP_STATUS_FSFREQ_ABORTNOTNEEDED 0x00000080 |
113 | #define ZFCP_STATUS_FSFREQ_TMFUNCFAILED 0x00000200 | 113 | #define ZFCP_STATUS_FSFREQ_TMFUNCFAILED 0x00000200 |
114 | #define ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP 0x00000400 | ||
115 | #define ZFCP_STATUS_FSFREQ_DISMISSED 0x00001000 | 114 | #define ZFCP_STATUS_FSFREQ_DISMISSED 0x00001000 |
116 | 115 | ||
117 | /************************* STRUCTURE DEFINITIONS *****************************/ | 116 | /************************* STRUCTURE DEFINITIONS *****************************/ |
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index 72bb9bcf7356..771cc536a989 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c | |||
@@ -264,9 +264,6 @@ static int zfcp_task_mgmt_function(struct scsi_cmnd *scpnt, u8 tm_flags) | |||
264 | if (fsf_req->status & ZFCP_STATUS_FSFREQ_TMFUNCFAILED) { | 264 | if (fsf_req->status & ZFCP_STATUS_FSFREQ_TMFUNCFAILED) { |
265 | zfcp_dbf_scsi_devreset("fail", tm_flags, unit, scpnt); | 265 | zfcp_dbf_scsi_devreset("fail", tm_flags, unit, scpnt); |
266 | retval = FAILED; | 266 | retval = FAILED; |
267 | } else if (fsf_req->status & ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP) { | ||
268 | zfcp_dbf_scsi_devreset("nsup", tm_flags, unit, scpnt); | ||
269 | retval = FAILED; | ||
270 | } else | 267 | } else |
271 | zfcp_dbf_scsi_devreset("okay", tm_flags, unit, scpnt); | 268 | zfcp_dbf_scsi_devreset("okay", tm_flags, unit, scpnt); |
272 | 269 | ||