git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
scsi
/
scsi.c
diff --git
a/drivers/scsi/scsi.c
b/drivers/scsi/scsi.c
index
12f8187
..
17dce66
100644
(file)
--- a/
drivers/scsi/scsi.c
+++ b/
drivers/scsi/scsi.c
@@
-56,8
+56,14
@@
#include <linux/notifier.h>
#include <linux/cpu.h>
#include <linux/notifier.h>
#include <linux/cpu.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_dbg.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_eh.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_host.h>
-#include "scsi.h"
+#include <scsi/scsi_tcq.h>
+#include <scsi/scsi_request.h>
#include "scsi_priv.h"
#include "scsi_logging.h"
#include "scsi_priv.h"
#include "scsi_logging.h"
@@
-400,7
+406,7
@@
void scsi_log_send(struct scsi_cmnd *cmd)
* output in scsi_log_completion.
*/
printk(" ");
* output in scsi_log_completion.
*/
printk(" ");
-
print_command(cmd->cmn
d);
+
scsi_print_command(cm
d);
if (level > 3) {
printk(KERN_INFO "buffer = 0x%p, bufflen = %d,"
" done = 0x%p, queuecommand 0x%p\n",
if (level > 3) {
printk(KERN_INFO "buffer = 0x%p, bufflen = %d,"
" done = 0x%p, queuecommand 0x%p\n",
@@
-468,13
+474,13
@@
void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
printk("UNKNOWN");
}
printk(" %8x ", cmd->result);
printk("UNKNOWN");
}
printk(" %8x ", cmd->result);
-
print_command(cmd->cmn
d);
+
scsi_print_command(cm
d);
if (status_byte(cmd->result) & CHECK_CONDITION) {
/*
* XXX The print_sense formatting/prefix
* doesn't match this function.
*/
if (status_byte(cmd->result) & CHECK_CONDITION) {
/*
* XXX The print_sense formatting/prefix
* doesn't match this function.
*/
- print_sense("", cmd);
+
scsi_
print_sense("", cmd);
}
if (level > 3) {
printk(KERN_INFO "scsi host busy %d failed %d\n",
}
if (level > 3) {
printk(KERN_INFO "scsi host busy %d failed %d\n",
@@
-689,8
+695,6
@@
static DEFINE_PER_CPU(struct list_head, scsi_done_q);
*/
void scsi_done(struct scsi_cmnd *cmd)
{
*/
void scsi_done(struct scsi_cmnd *cmd)
{
- unsigned long flags;
-
/*
* We don't have to worry about this one timing out any more.
* If we are unable to remove the timer, then the command
/*
* We don't have to worry about this one timing out any more.
* If we are unable to remove the timer, then the command
@@
-701,6
+705,14
@@
void scsi_done(struct scsi_cmnd *cmd)
*/
if (!scsi_delete_timer(cmd))
return;
*/
if (!scsi_delete_timer(cmd))
return;
+ __scsi_done(cmd);
+}
+
+/* Private entry to scsi_done() to complete a command when the timer
+ * isn't running --- used by scsi_times_out */
+void __scsi_done(struct scsi_cmnd *cmd)
+{
+ unsigned long flags;
/*
* Set the serial numbers back to zero
/*
* Set the serial numbers back to zero