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: (166 commits)
  [SCSI] ibmvscsi: convert to use the data buffer accessors
  [SCSI] dc395x: convert to use the data buffer accessors
  [SCSI] ncr53c8xx: convert to use the data buffer accessors
  [SCSI] sym53c8xx: convert to use the data buffer accessors
  [SCSI] ppa: coding police and printk levels
  [SCSI] aic7xxx_old: remove redundant GFP_ATOMIC from kmalloc
  [SCSI] i2o: remove redundant GFP_ATOMIC from kmalloc from device.c
  [SCSI] remove the dead CYBERSTORMIII_SCSI option
  [SCSI] don't build scsi_dma_{map,unmap} for !HAS_DMA
  [SCSI] Clean up scsi_add_lun a bit
  [SCSI] 53c700: Remove printk, which triggers because of low scsi clock on SNI RMs
  [SCSI] sni_53c710: Cleanup
  [SCSI] qla4xxx: Fix underrun/overrun conditions
  [SCSI] megaraid_mbox: use mutex instead of semaphore
  [SCSI] aacraid: add 51245, 51645 and 52245 adapters to documentation.
  [SCSI] qla2xxx: update version to 8.02.00-k1.
  [SCSI] qla2xxx: add support for NPIV
  [SCSI] stex: use resid for xfer len information
  [SCSI] Add Brownie 1200U3P to blacklist
  [SCSI] scsi.c: convert to use the data buffer accessors
  ...

1 files changed, 1 insertions, 47 deletions

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 4c1e31334765..a691dda40d2c 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -368,7 +368,7 @@ void scsi_log_send(struct scsi_cmnd *cmd)
                         if (level > 3) {
                                 printk(KERN_INFO "buffer = 0x%p, bufflen = %d,"
                                        " done = 0x%p, queuecommand 0x%p\n",
-                                        cmd->request_buffer, cmd->request_bufflen,
+                                        scsi_sglist(cmd), scsi_bufflen(cmd),
                                         cmd->done,
                                         cmd->device->host->hostt->queuecommand);
 
@@ -1016,52 +1016,6 @@ struct scsi_device *scsi_device_lookup(struct Scsi_Host *shost,
 }
 EXPORT_SYMBOL(scsi_device_lookup);
 
-/**
- * scsi_device_cancel - cancel outstanding IO to this device
- * @sdev:       Pointer to struct scsi_device
- * @recovery:   Boolean instructing function to recover device or not.
- *
- **/
-int scsi_device_cancel(struct scsi_device *sdev, int recovery)
-{
-        struct scsi_cmnd *scmd;
-        LIST_HEAD(active_list);
-        struct list_head *lh, *lh_sf;
-        unsigned long flags;
-
-        scsi_device_set_state(sdev, SDEV_CANCEL);
-
-        spin_lock_irqsave(&sdev->list_lock, flags);
-        list_for_each_entry(scmd, &sdev->cmd_list, list) {
-                if (scmd->request) {
-                        /*
-                         * If we are unable to remove the timer, it means
-                         * that the command has already timed out or
-                         * finished.
-                         */
-                        if (!scsi_delete_timer(scmd))
-                                continue;
-                        list_add_tail(&scmd->eh_entry, &active_list);
-                }
-        }
-        spin_unlock_irqrestore(&sdev->list_lock, flags);
-
-        if (!list_empty(&active_list)) {
-                list_for_each_safe(lh, lh_sf, &active_list) {
-                        scmd = list_entry(lh, struct scsi_cmnd, eh_entry);
-                        list_del_init(lh);
-                        if (recovery &&
-                            !scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD)) {
-                                scmd->result = (DID_ABORT << 16);
-                                scsi_finish_command(scmd);
-                        }
-                }
-        }
-
-        return 0;
-}
-EXPORT_SYMBOL(scsi_device_cancel);
-
 MODULE_DESCRIPTION("SCSI core");
 MODULE_LICENSE("GPL");