Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6

[karo-tx-linux.git] / drivers / scsi / libsas / sas_scsi_host.c

diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 25d0f127424d9ece9155c9e21c6b3828c193135b..24e477d2ea701d97a9afe69bf48831cbb8c8cf66 100644 (file)
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -404,7 +404,7 @@ static int sas_recover_lu(struct domain_device *dev, struct scsi_cmnd *cmd)
 
        int_to_scsilun(cmd->device->lun, &lun);
 
-       SAS_DPRINTK("eh: device %llx LUN %x has the task\n",
+       SAS_DPRINTK("eh: device %llx LUN %llx has the task\n",
                    SAS_ADDR(dev->sas_addr),
                    cmd->device->lun);
 
@@ -490,7 +490,8 @@ static void sas_wait_eh(struct domain_device *dev)
 }
 EXPORT_SYMBOL(sas_wait_eh);
 
-static int sas_queue_reset(struct domain_device *dev, int reset_type, int lun, int wait)
+static int sas_queue_reset(struct domain_device *dev, int reset_type,
+                          u64 lun, int wait)
 {
        struct sas_ha_struct *ha = dev->port->ha;
        int scheduled = 0, tries = 100;
@@ -689,7 +690,7 @@ static void sas_eh_handle_sas_errors(struct Scsi_Host *shost, struct list_head *
  reset:
                        tmf_resp = sas_recover_lu(task->dev, cmd);
                        if (tmf_resp == TMF_RESP_FUNC_COMPLETE) {
-                               SAS_DPRINTK("dev %016llx LU %x is "
+                               SAS_DPRINTK("dev %016llx LU %llx is "
                                            "recovered\n",
                                            SAS_ADDR(task->dev),
                                            cmd->device->lun);
@@ -742,7 +743,7 @@ static void sas_eh_handle_sas_errors(struct Scsi_Host *shost, struct list_head *
                         * of effort could recover from errors.  Quite
                         * possibly the HA just disappeared.
                         */
-                       SAS_DPRINTK("error from  device %llx, LUN %x "
+                       SAS_DPRINTK("error from  device %llx, LUN %llx "
                                    "couldn't be recovered in any way\n",
                                    SAS_ADDR(task->dev->sas_addr),
                                    cmd->device->lun);
@@ -812,7 +813,7 @@ retry:
        spin_unlock_irq(shost->host_lock);
 
        SAS_DPRINTK("Enter %s busy: %d failed: %d\n",
-                   __func__, shost->host_busy, shost->host_failed);
+                   __func__, atomic_read(&shost->host_busy), shost->host_failed);
        /*
         * Deal with commands that still have SAS tasks (i.e. they didn't
         * complete via the normal sas_task completion mechanism),
@@ -857,7 +858,8 @@ out:
                goto retry;
 
        SAS_DPRINTK("--- Exit %s: busy: %d failed: %d tries: %d\n",
-                   __func__, shost->host_busy, shost->host_failed, tries);
+                   __func__, atomic_read(&shost->host_busy),
+                   shost->host_failed, tries);
 }
 
 enum blk_eh_timer_return sas_scsi_timed_out(struct scsi_cmnd *cmd)
@@ -941,7 +943,7 @@ int sas_slave_configure(struct scsi_device *scsi_dev)
                scsi_set_tag_type(scsi_dev, MSG_SIMPLE_TAG);
                scsi_activate_tcq(scsi_dev, SAS_DEF_QD);
        } else {
-               SAS_DPRINTK("device %llx, LUN %x doesn't support "
+               SAS_DPRINTK("device %llx, LUN %llx doesn't support "
                            "TCQ\n", SAS_ADDR(dev->sas_addr),
                            scsi_dev->lun);
                scsi_dev->tagged_supported = 0;