diff options
| author | James Bottomley <James.Bottomley@suse.de> | 2010-05-18 10:33:43 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-05-18 10:37:41 -0400 |
| commit | 95bb335c0ebe96afe926387a1ef3a096bd884a82 (patch) | |
| tree | 56115332b4f2f7ef300c36248a6a7d20db2e639d /drivers/scsi/scsi.c | |
| parent | 1b4d0d8ea7b3cbd107f345ab766416f9b38ce66a (diff) | |
| parent | 9cccde93fed1ca988eb2fb17ab9194bf7b5ed1b0 (diff) | |
| download | op-kernel-dev-95bb335c0ebe96afe926387a1ef3a096bd884a82.zip op-kernel-dev-95bb335c0ebe96afe926387a1ef3a096bd884a82.tar.gz | |
[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/scsi.c')
| -rw-r--r-- | drivers/scsi/scsi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 1c08f61..ad0ed21 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -67,6 +67,9 @@ #include "scsi_priv.h" #include "scsi_logging.h" +#define CREATE_TRACE_POINTS +#include <trace/events/scsi.h> + static void scsi_done(struct scsi_cmnd *cmd); /* @@ -747,10 +750,12 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd) cmd->result = (DID_NO_CONNECT << 16); scsi_done(cmd); } else { + trace_scsi_dispatch_cmd_start(cmd); rtn = host->hostt->queuecommand(cmd, scsi_done); } spin_unlock_irqrestore(host->host_lock, flags); if (rtn) { + trace_scsi_dispatch_cmd_error(cmd, rtn); if (rtn != SCSI_MLQUEUE_DEVICE_BUSY && rtn != SCSI_MLQUEUE_TARGET_BUSY) rtn = SCSI_MLQUEUE_HOST_BUSY; @@ -781,6 +786,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd) */ static void scsi_done(struct scsi_cmnd *cmd) { + trace_scsi_dispatch_cmd_done(cmd); blk_complete_request(cmd->request); } |
