diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:44:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:44:25 -0500 |
commit | 5f0b1437e0708772b6fecae5900c01c3b5f9b512 (patch) | |
tree | bcd923e305345178bc162ed8560d56a3af197224 /drivers/scsi/scsi.c | |
parent | 574009c1a895aeeb85eaab29c235d75852b09eb8 (diff) | |
parent | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (97 commits)
[SCSI] zfcp: removed wrong comment
[SCSI] zfcp: use of uninitialized variable
[SCSI] zfcp: Invalid locking order
[SCSI] aic79xx: use dma_get_required_mask()
[SCSI] aic79xx: fix bracket mismatch in unused macro
[SCSI] BusLogic: Replace 'boolean' by 'bool'
[SCSI] advansys: clean up warnings
[SCSI] 53c7xx: brackets fix in uncompiled code
[SCSI] nsp_cs: remove old scsi code
[SCSI] aic79xx: make ahd_match_scb() static
[SCSI] DAC960: kmalloc->kzalloc/Casting cleanups
[SCSI] scsi_kmap_atomic_sg(): check that local irqs are disabled
[SCSI] Buslogic: local_irq_disable() is redundant after local_irq_save()
[SCSI] aic94xx: update for v28 firmware
[SCSI] scsi_error: Fix lost EH commands
[SCSI] aic94xx: Add default bus reset handler
[SCSI] aic94xx: Remove TMF result code munging
[SCSI] libsas: Add an LU reset mechanism to the error handler
[SCSI] libsas: Don't BUG when connecting two expanders via wide port
[SCSI] st: fix Tape dies if wrong block size used, bug 7919
...
Diffstat (limited to 'drivers/scsi/scsi.c')
-rw-r--r-- | drivers/scsi/scsi.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 24cffd98ee63..f33e2eb9f1b9 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c | |||
@@ -673,27 +673,6 @@ void __scsi_done(struct scsi_cmnd *cmd) | |||
673 | } | 673 | } |
674 | 674 | ||
675 | /* | 675 | /* |
676 | * Function: scsi_retry_command | ||
677 | * | ||
678 | * Purpose: Send a command back to the low level to be retried. | ||
679 | * | ||
680 | * Notes: This command is always executed in the context of the | ||
681 | * bottom half handler, or the error handler thread. Low | ||
682 | * level drivers should not become re-entrant as a result of | ||
683 | * this. | ||
684 | */ | ||
685 | int scsi_retry_command(struct scsi_cmnd *cmd) | ||
686 | { | ||
687 | /* | ||
688 | * Zero the sense information from the last time we tried | ||
689 | * this command. | ||
690 | */ | ||
691 | memset(cmd->sense_buffer, 0, sizeof(cmd->sense_buffer)); | ||
692 | |||
693 | return scsi_queue_insert(cmd, SCSI_MLQUEUE_EH_RETRY); | ||
694 | } | ||
695 | |||
696 | /* | ||
697 | * Function: scsi_finish_command | 676 | * Function: scsi_finish_command |
698 | * | 677 | * |
699 | * Purpose: Pass command off to upper layer for finishing of I/O | 678 | * Purpose: Pass command off to upper layer for finishing of I/O |