dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

cciss: Set the performant mode bit in the scsi half of the driver 

cciss: Set the performant mode bit in the scsi half of the driver
In a couple of places, the performant mode bit wasn't being set in
the scsi half of the driver, causing commands to seem to hang.  Use
enqueue_cmd_and_start_io() where appropriate.  This fixes a bug that

	echo engage scsi > /proc/driver/cciss/cciss0

would hang.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
Stephen M. Cameron 2010-07-19 13:44:45 -05:00 committed by Jens Axboe
parent d54142c71f
commit 373b45f7b6
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/block/cciss_scsi.c
View File

@ -921,7 +921,6 @@ cciss_scsi_do_simple_cmd(ctlr_info_t *c,
unsigned char *buf, int bufsize,
int direction)
{
unsigned long flags;
DECLARE_COMPLETION_ONSTACK(wait);
cp->cmd_type = CMD_IOCTL_PEND; // treat this like an ioctl
@ -948,14 +947,7 @@ cciss_scsi_do_simple_cmd(ctlr_info_t *c,
bufsize, DMA_FROM_DEVICE);
cp->waiting = &wait;
/* Put the request on the tail of the request queue */
spin_lock_irqsave(CCISS_LOCK(c->ctlr), flags);
addQ(&c->reqQ, cp);
c->Qdepth++;
start_io(c);
spin_unlock_irqrestore(CCISS_LOCK(c->ctlr), flags);
enqueue_cmd_and_start_io(c, cp);
wait_for_completion(&wait);
/* undo the dma mapping */
@ -1525,15 +1517,7 @@ cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd
break;
}
cciss_scatter_gather(c, cp, cmd);
/* Put the request on the tail of the request queue */
spin_lock_irqsave(CCISS_LOCK(ctlr), flags);
addQ(&c->reqQ, cp);
c->Qdepth++;
start_io(c);
spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);
enqueue_cmd_and_start_io(c, cp);
/* the cmd'll come back via intr handler in complete_scsi_command() */
return 0;
}