From 3f90ce5fe049b5ff7f3f4101e33b40ee3706b527 Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Tue, 24 Nov 2009 16:54:18 +0100 Subject: [PATCH] --- yaml --- r: 173761 b: refs/heads/master c: 54987386ee3790f3900de4df2ed4deb0e18dfc9f h: refs/heads/master i: 173759: 0b7f98c191cbdb51d8712503c845e094498fde2a v: v3 --- [refs] | 2 +- trunk/drivers/s390/scsi/zfcp_def.h | 1 - trunk/drivers/s390/scsi/zfcp_scsi.c | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f5455e900804..548c697337d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fdd21330a9d7bc6790eae0aed768052c315ae44 +refs/heads/master: 54987386ee3790f3900de4df2ed4deb0e18dfc9f diff --git a/trunk/drivers/s390/scsi/zfcp_def.h b/trunk/drivers/s390/scsi/zfcp_def.h index e43c6334bf69..e1b5b88e2ddb 100644 --- a/trunk/drivers/s390/scsi/zfcp_def.h +++ b/trunk/drivers/s390/scsi/zfcp_def.h @@ -111,7 +111,6 @@ #define ZFCP_STATUS_FSFREQ_ABORTSUCCEEDED 0x00000040 #define ZFCP_STATUS_FSFREQ_ABORTNOTNEEDED 0x00000080 #define ZFCP_STATUS_FSFREQ_TMFUNCFAILED 0x00000200 -#define ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP 0x00000400 #define ZFCP_STATUS_FSFREQ_DISMISSED 0x00001000 /************************* STRUCTURE DEFINITIONS *****************************/ diff --git a/trunk/drivers/s390/scsi/zfcp_scsi.c b/trunk/drivers/s390/scsi/zfcp_scsi.c index 72bb9bcf7356..771cc536a989 100644 --- a/trunk/drivers/s390/scsi/zfcp_scsi.c +++ b/trunk/drivers/s390/scsi/zfcp_scsi.c @@ -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) { zfcp_dbf_scsi_devreset("fail", tm_flags, unit, scpnt); retval = FAILED; - } else if (fsf_req->status & ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP) { - zfcp_dbf_scsi_devreset("nsup", tm_flags, unit, scpnt); - retval = FAILED; } else zfcp_dbf_scsi_devreset("okay", tm_flags, unit, scpnt);