2002-10-14 21:03:57

by Cameron, Steve

[permalink] [raw]
Subject: [PATCH] 2.5.42, cciss, no scsi tape timeouts (1 of 7)

I have re-done our cciss patches for 2.5.42, and reordered them so that
smaller/simpler/important ones are first, bigger more complicated/less
important ones are last to make them easier to swallow.

Here's the first: patch (1 of 7)
This patch eliminates the timeout on scsi commands to tape drives.
The driver doesn't do anything good if the command times out, and the
timeout is too short. Better to have no timeout.

-- steve

diff -urN linux-2.5.42-a/drivers/block/cciss_scsi.c linux-2.5.42-b/drivers/block/cciss_scsi.c
--- linux-2.5.42-a/drivers/block/cciss_scsi.c Fri Sep 27 16:49:15 2002
+++ linux-2.5.42-b/drivers/block/cciss_scsi.c Mon Oct 14 10:08:24 2002
@@ -913,7 +913,7 @@

memset(cp->Request.CDB, 0, sizeof(cp->Request.CDB));
memcpy(cp->Request.CDB, cdb, cdblen);
- cp->Request.Timeout = 1000; // guarantee completion.
+ cp->Request.Timeout = 0;
cp->Request.CDBLen = cdblen;
cp->Request.Type.Type = TYPE_CMD;
cp->Request.Type.Attribute = ATTR_SIMPLE;
@@ -1445,7 +1445,7 @@

// Fill in the request block...

- cp->Request.Timeout = 1000; // guarantee completion
+ cp->Request.Timeout = 0;
memset(cp->Request.CDB, 0, sizeof(cp->Request.CDB));
if (cmd->cmd_len > sizeof(cp->Request.CDB)) BUG();
cp->Request.CDBLen = cmd->cmd_len;