[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, 3 insertions, 3 deletions

diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c
index 83314a18db2b..b292272d296f 100644
--- a/drivers/scsi/libfc/fc_disc.c
+++ b/drivers/scsi/libfc/fc_disc.c
@@ -607,7 +607,7 @@ static void fc_disc_gpn_id_resp(struct fc_seq *sp, struct fc_frame *fp,
                         rdata->ids.port_name = port_name;
                 else if (rdata->ids.port_name != port_name) {
                         FC_DISC_DBG(disc, "GPN_ID accepted.  WWPN changed. "
-                                    "Port-id %6.6x wwpn %llx\n",
+                                    "Port-id %6.6x wwpn %16.16llx\n",
                                     rdata->ids.port_id, port_name);
                         lport->tt.rport_logoff(rdata);
 
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index e89bdd53acf0..ef25e11abd33 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -800,11 +800,11 @@ static void fc_lport_recv_flogi_req(struct fc_seq *sp_in,
         remote_wwpn = get_unaligned_be64(&flp->fl_wwpn);
         if (remote_wwpn == lport->wwpn) {
                 printk(KERN_WARNING "host%d: libfc: Received FLOGI from port "
-                       "with same WWPN %llx\n",
+                       "with same WWPN %16.16llx\n",
                        lport->host->host_no, remote_wwpn);
                 goto out;
         }
-        FC_LPORT_DBG(lport, "FLOGI from port WWPN %llx\n", remote_wwpn);
+        FC_LPORT_DBG(lport, "FLOGI from port WWPN %16.16llx\n", remote_wwpn);
 
         /*
          * XXX what is the right thing to do for FIDs?