[SCSI] libfc, fcoe: normalize format specifies for world wide names

Print all world wide node names (node, port and fabric) with the same
format specifier of "%16.16llx".  That makes sure they all print as a
16 character hex string, with lower case letters, no 0x prefix, and
without stripping off any leading 0s.

Signed-off-by: Chris Leech <christopher.leech@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

2 files changed, 14 insertions, 10 deletions

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 25a7ce5c2d24..aba839e68014 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -934,7 +934,8 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe,
         }
 
         if (npiv) {
-                FCOE_NETDEV_DBG(netdev, "Setting vport names, 0x%llX 0x%llX\n",
+                FCOE_NETDEV_DBG(netdev, "Setting vport names, "
+                                "%16.16llx %16.16llx\n",
                                 vport->node_name, vport->port_name);
                 fc_set_wwnn(lport, vport->node_name);
                 fc_set_wwpn(lport, vport->port_name);
diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
index de5c329cb3b4..aadd24962e92 100644
--- a/drivers/scsi/fcoe/libfcoe.c
+++ b/drivers/scsi/fcoe/libfcoe.c
@@ -583,7 +583,7 @@ static void fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
                                             smp_processor_id());
                         stats->MissDiscAdvCount++;
                         printk(KERN_INFO "libfcoe: host%d: Missing Discovery "
-                               "Advertisement for fab %llx count %lld\n",
+                               "Advertisement for fab %16.16llx count %lld\n",
                                fip->lp->host->host_no, fcf->fabric_name,
                                stats->MissDiscAdvCount);
                 }
@@ -780,7 +780,8 @@ static void fcoe_ctlr_recv_adv(struct fcoe_ctlr *fip, struct sk_buff *skb)
         mtu_valid = fcoe_ctlr_mtu_valid(fcf);
         fcf->time = jiffies;
         if (!found) {
-                LIBFCOE_FIP_DBG(fip, "New FCF for fab %llx map %x val %d\n",
+                LIBFCOE_FIP_DBG(fip, "New FCF for fab %16.16llx "
+                                "map %x val %d\n",
                                 fcf->fabric_name, fcf->fc_map, mtu_valid);
         }
 
@@ -1108,15 +1109,17 @@ static void fcoe_ctlr_select(struct fcoe_ctlr *fip)
         struct fcoe_fcf *best = NULL;
 
         list_for_each_entry(fcf, &fip->fcfs, list) {
-                LIBFCOE_FIP_DBG(fip, "consider FCF for fab %llx VFID %d map %x "
-                                "val %d\n", fcf->fabric_name, fcf->vfid,
+                LIBFCOE_FIP_DBG(fip, "consider FCF for fab %16.16llx "
+                                "VFID %d map %x val %d\n",
+                                fcf->fabric_name, fcf->vfid,
                                 fcf->fc_map, fcoe_ctlr_mtu_valid(fcf));
                 if (!fcoe_ctlr_fcf_usable(fcf)) {
-                        LIBFCOE_FIP_DBG(fip, "FCF for fab %llx map %x %svalid "
-                                        "%savailable\n", fcf->fabric_name,
-                                        fcf->fc_map, (fcf->flags & FIP_FL_SOL)
-                                        ? "" : "in", (fcf->flags & FIP_FL_AVAIL)
-                                        ? "" : "un");
+                        LIBFCOE_FIP_DBG(fip, "FCF for fab %16.16llx "
+                                        "map %x %svalid %savailable\n",
+                                        fcf->fabric_name, fcf->fc_map,
+                                        (fcf->flags & FIP_FL_SOL) ? "" : "in",
+                                        (fcf->flags & FIP_FL_AVAIL) ?
+                                        "" : "un");
                         continue;
                 }
                 if (!best) {