[PATCH 2/2] cciss: fix XFER_READ/XFER_WRITE in do_cciss_request

[PATCH 2/2] cciss: fix XFER_READ/XFER_WRITE in do_cciss_request

[Mike Miller (OS Dev)]

Patch 2 of 2

This patch fixes a stupid bug. Sometime during the 2tb enhancement I ended up
replacing the macros XFER_READ and XFER_WRITE with h->cciss_read and
h->cciss_write respectively. It seemed to work somehow at least on x86_64 and
ia64. I don't know how. But people started complaining about command timeouts
on older controllers like the 64xx series and only on ia32. This resolves the
issue reproduced in our lab. Please consider this for inclusion. 

Thanks,
mikem

Signed-off-by: Mike Miller <mike.miller@hp.com>
--------------------------------------------------------------------------------

 drivers/block/cciss.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/block/cciss.c~cciss_xfer_fix drivers/block/cciss.c
--- linux-2.6-work/drivers/block/cciss.c~cciss_xfer_fix	2006-12-15 08:56:40.000000000 -0600
+++ linux-2.6-work-mikem/drivers/block/cciss.c	2006-12-15 08:58:20.000000000 -0600
@@ -2492,7 +2492,7 @@ static void do_cciss_request(request_que
 	c->Request.Type.Type = TYPE_CMD;	// It is a command.
 	c->Request.Type.Attribute = ATTR_SIMPLE;
 	c->Request.Type.Direction =
-	    (rq_data_dir(creq) == READ) ? h->cciss_read : h->cciss_write;
+	    (rq_data_dir(creq) == READ) ? XFER_READ : XFER_WRITE;
 	c->Request.Timeout = 0;	// Don't time out
 	c->Request.CDB[0] =
 	    (rq_data_dir(creq) == READ) ? h->cciss_read : h->cciss_write;
_

Re: [PATCH 2/2] cciss: fix XFER_READ/XFER_WRITE in do_cciss_request

[Jens Axboe]

On Fri, Dec 15 2006, Mike Miller (OS Dev) wrote:
> Patch 2 of 2
> 
> This patch fixes a stupid bug. Sometime during the 2tb enhancement I ended up
> replacing the macros XFER_READ and XFER_WRITE with h->cciss_read and
> h->cciss_write respectively. It seemed to work somehow at least on x86_64 and
> ia64. I don't know how. But people started complaining about command timeouts
> on older controllers like the 64xx series and only on ia32. This resolves the
> issue reproduced in our lab. Please consider this for inclusion. 

Great, works here as well. Applied 1+2.

-- 
Jens Axboe