diff options
author | Matthew Wilcox <matthew@wil.cx> | 2006-03-28 11:03:44 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-04-13 11:13:24 -0400 |
commit | 3bea15a76eecc03729bf74d6ab2a1f849c08423e (patch) | |
tree | 674e96482b034ed57222878816f87c63cc5d800f /drivers/scsi/sym53c8xx_2/sym_hipd.c | |
parent | 76789f01768bb4cef706f4c9e7e2f3f4eb8c1431 (diff) |
[SCSI] Disable sym2 driver queueing
Undef SYM_OPT_HANDLE_DEVICE_QUEUEING.
Call sym_put_start_queue instead of sym_start_next_ccbs.
Turn asserts into checks that we can send the command to the adapter,
and return busy from queuecommand if we can't.
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sym53c8xx_2/sym_hipd.c')
-rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_hipd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c index b2ac482caae8..a6cbb90e2bb9 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.c +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c | |||
@@ -1469,7 +1469,7 @@ static int sym_prepare_nego(struct sym_hcb *np, struct sym_ccb *cp, u_char *msgp | |||
1469 | /* | 1469 | /* |
1470 | * Insert a job into the start queue. | 1470 | * Insert a job into the start queue. |
1471 | */ | 1471 | */ |
1472 | static void sym_put_start_queue(struct sym_hcb *np, struct sym_ccb *cp) | 1472 | void sym_put_start_queue(struct sym_hcb *np, struct sym_ccb *cp) |
1473 | { | 1473 | { |
1474 | u_short qidx; | 1474 | u_short qidx; |
1475 | 1475 | ||
@@ -4602,7 +4602,8 @@ struct sym_ccb *sym_get_ccb (struct sym_hcb *np, struct scsi_cmnd *cmd, u_char t | |||
4602 | * Debugging purpose. | 4602 | * Debugging purpose. |
4603 | */ | 4603 | */ |
4604 | #ifndef SYM_OPT_HANDLE_DEVICE_QUEUEING | 4604 | #ifndef SYM_OPT_HANDLE_DEVICE_QUEUEING |
4605 | assert(lp->busy_itl == 0); | 4605 | if (lp->busy_itl != 0) |
4606 | goto out_free; | ||
4606 | #endif | 4607 | #endif |
4607 | /* | 4608 | /* |
4608 | * Allocate resources for tags if not yet. | 4609 | * Allocate resources for tags if not yet. |
@@ -4647,7 +4648,8 @@ struct sym_ccb *sym_get_ccb (struct sym_hcb *np, struct scsi_cmnd *cmd, u_char t | |||
4647 | * Debugging purpose. | 4648 | * Debugging purpose. |
4648 | */ | 4649 | */ |
4649 | #ifndef SYM_OPT_HANDLE_DEVICE_QUEUEING | 4650 | #ifndef SYM_OPT_HANDLE_DEVICE_QUEUEING |
4650 | assert(lp->busy_itl == 0 && lp->busy_itlq == 0); | 4651 | if (lp->busy_itl != 0 || lp->busy_itlq != 0) |
4652 | goto out_free; | ||
4651 | #endif | 4653 | #endif |
4652 | /* | 4654 | /* |
4653 | * Count this nexus for this LUN. | 4655 | * Count this nexus for this LUN. |