hpsa: print accurate SSD Smart Path Enabled status

offload_enabled changes are deferred until after the
added/updated prints occur, so the values are incorrect.

defer printing SSD Smart Path Enabled status information until the
information is correct

Reviewed-by: Scott Teel <scott.teel@pmcs.com>
Reviewed-by: Kevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Reviewed-by: Hannes Reinecke <hare@Suse.de>
Signed-off-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Don Brace <don.brace@pmcs.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 0331c9ab3b3598d662e81821fd99f24dbae30175..2fadf6aa965d9f2d9a3f925872b71307c15e40da 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -1060,12 +1060,12 @@ lun_assigned:
 
        h->dev[n] = device;
        h->ndevices++;
-       device->offload_to_be_enabled = device->offload_enabled;
-       device->offload_enabled = 0;
        added[*nadded] = device;
        (*nadded)++;
        hpsa_show_dev_msg(KERN_INFO, h, device,
                device->expose_state & HPSA_SCSI_ADD ? "added" : "masked");
+       device->offload_to_be_enabled = device->offload_enabled;
+       device->offload_enabled = 0;
        return 0;
 }
 
@@ -1073,6 +1073,7 @@ lun_assigned:
 static void hpsa_scsi_update_entry(struct ctlr_info *h, int hostno,
        int entry, struct hpsa_scsi_dev_t *new_entry)
 {
+       int offload_enabled;
        /* assumes h->devlock is held */
        BUG_ON(entry < 0 || entry >= HPSA_MAX_DEVICES);
 
@@ -1105,7 +1106,10 @@ static void hpsa_scsi_update_entry(struct ctlr_info *h, int hostno,
        if (!new_entry->offload_enabled)
                h->dev[entry]->offload_enabled = 0;
 
+       offload_enabled = h->dev[entry]->offload_enabled;
+       h->dev[entry]->offload_enabled = h->dev[entry]->offload_to_be_enabled;
        hpsa_show_dev_msg(KERN_INFO, h, h->dev[entry], "updated");
+       h->dev[entry]->offload_enabled = offload_enabled;
 }
 
 /* Replace an entry from h->dev[] array. */
@@ -1128,12 +1132,12 @@ static void hpsa_scsi_replace_entry(struct ctlr_info *h, int hostno,
                new_entry->lun = h->dev[entry]->lun;
        }
 
-       new_entry->offload_to_be_enabled = new_entry->offload_enabled;
-       new_entry->offload_enabled = 0;
        h->dev[entry] = new_entry;
        added[*nadded] = new_entry;
        (*nadded)++;
        hpsa_show_dev_msg(KERN_INFO, h, new_entry, "replaced");
+       new_entry->offload_to_be_enabled = new_entry->offload_enabled;
+       new_entry->offload_enabled = 0;
 }
 
 /* Remove an entry from h->dev[] array. */