[SCSI] fcoe: Use per-CPU kernel function for dev_stats instead of an array

Remove the hotplug creation of dev_stats, we allocate for all possible CPUs
now when we allocate the lport.

v2: Durring the 2.6.30 merge window, before these patches were comitted,
'percpu_ptr' was renamed 'per_cpu_ptr'. This latest update updates this
patch for the name change.

Signed-off-by: Yi Zou <yi.zou@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

2 files changed, 11 insertions, 8 deletions

diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index a5725f3b7ce1..0997e8b1dcea 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -407,10 +407,12 @@ static void fc_fcp_recv_data(struct fc_fcp_pkt *fsp, struct fc_frame *fp)
 
                 if (~crc != le32_to_cpu(fr_crc(fp))) {
 crc_err:
-                        stats = lp->dev_stats[smp_processor_id()];
+                        stats = fc_lport_get_stats(lp);
                         stats->ErrorFrames++;
+                        /* FIXME - per cpu count, not total count! */
                         if (stats->InvalidCRCCount++ < 5)
-                                FC_DBG("CRC error on data frame\n");
+                                printk(KERN_WARNING "CRC error on data frame for port (%6x)\n",
+                                       fc_host_port_id(lp->host));
                         /*
                          * Assume the frame is total garbage.
                          * We may have copied it over the good part
@@ -1752,7 +1754,7 @@ int fc_queuecommand(struct scsi_cmnd *sc_cmd, void (*done)(struct scsi_cmnd *))
         /*
          * setup the data direction
          */
-        stats = lp->dev_stats[smp_processor_id()];
+        stats = fc_lport_get_stats(lp);
         if (sc_cmd->sc_data_direction == DMA_FROM_DEVICE) {
                 fsp->req_flags = FC_SRB_READ;
                 stats->InputRequests++;
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 7ef44501ecc6..b8178ef398d7 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -267,10 +267,10 @@ EXPORT_SYMBOL(fc_get_host_speed);
 
 struct fc_host_statistics *fc_get_host_stats(struct Scsi_Host *shost)
 {
-        int i;
         struct fc_host_statistics *fcoe_stats;
         struct fc_lport *lp = shost_priv(shost);
         struct timespec v0, v1;
+        unsigned int cpu;
 
         fcoe_stats = &lp->host_stats;
         memset(fcoe_stats, 0, sizeof(struct fc_host_statistics));
@@ -279,10 +279,11 @@ struct fc_host_statistics *fc_get_host_stats(struct Scsi_Host *shost)
         jiffies_to_timespec(lp->boot_time, &v1);
         fcoe_stats->seconds_since_last_reset = (v0.tv_sec - v1.tv_sec);
 
-        for_each_online_cpu(i) {
-                struct fcoe_dev_stats *stats = lp->dev_stats[i];
-                if (stats == NULL)
-                        continue;
+        for_each_possible_cpu(cpu) {
+                struct fcoe_dev_stats *stats;
+
+                stats = per_cpu_ptr(lp->dev_stats, cpu);
+
                 fcoe_stats->tx_frames += stats->TxFrames;
                 fcoe_stats->tx_words += stats->TxWords;
                 fcoe_stats->rx_frames += stats->RxFrames;