[patch 0/1] zfcp fixes for 2.6.28-rc6: missing patch

[patch 0/1] zfcp fixes for 2.6.28-rc6: missing patch

[Christof Schmitt]

James,

this fix should be part of yesterday's patch series for 2.6.28-rc6,
but it fell through some holes. It applies cleanly on top of the patch
series, please also include this fix.

thanks,

Christof

[patch 1/1] zfcp: prevent double decrement on host_busy while being busy

[Christof Schmitt]

[-- Attachment #1: 711-zfcp-decrement.diff --]
[-- Type: text/plain, Size: 1092 bytes --]

From: Swen Schillig <swen@vnet.ibm.com>

The zfcp_scsi_queuecommand was not acting according to the standard
when the respective unit was not available. In this case an -EBUSY was
returned, which is not valid in itself, and in addition scsi_done
was called. This combination is not allowed and was leading to a
double finish of the request and therefor double decrement of the
host_busy counter.

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

 drivers/s390/scsi/zfcp_scsi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/s390/scsi/zfcp_scsi.c	2008-11-26 17:21:58.000000000 +0100
+++ b/drivers/s390/scsi/zfcp_scsi.c	2008-11-27 10:58:30.000000000 +0100
@@ -88,7 +88,7 @@ static int zfcp_scsi_queuecommand(struct
 	ret = zfcp_fsf_send_fcp_command_task(adapter, unit, scpnt, 0,
 					     ZFCP_REQ_AUTO_CLEANUP);
 	if (unlikely(ret == -EBUSY))
-		zfcp_scsi_command_fail(scpnt, DID_NO_CONNECT);
+		return SCSI_MLQUEUE_DEVICE_BUSY;
 	else if (unlikely(ret < 0))
 		return SCSI_MLQUEUE_HOST_BUSY;
 

--