From: Brian King <brking@us.ibm.com>
Date: Tue, 21 Nov 2006 16:28:04 +0000 (-0600)
Subject: [SCSI] ipr: Stop issuing cancel all to disk arrays
X-Git-Tag: v2.6.20-rc2~6^2~13^2~5^2~46
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=04d9768ff8847b0ae8c41ac3cfb3c5bb2e31699a;p=linux-2.6-omap-h63xx.git

[SCSI] ipr: Stop issuing cancel all to disk arrays

The ipr disk array devices do not support a cancel all
requests primitive, so change the ipr driver to never
send it.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index c983f0f0758..244173adf8b 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -3776,7 +3776,7 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd)
 	 */
 	if (ioa_cfg->in_reset_reload || ioa_cfg->ioa_is_dead)
 		return FAILED;
-	if (!res || (!ipr_is_gscsi(res) && !ipr_is_vset_device(res)))
+	if (!res || !ipr_is_gscsi(res))
 		return FAILED;
 
 	list_for_each_entry(ipr_cmd, &ioa_cfg->pending_q, queue) {