hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Chris Leech 2010-04-09 14:23:16 -07:00 committed by James Bottomley
parent ce8b5df042
commit 9f8f3aa640
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/fcoe/fcoe.c
View File

@ -934,7 +934,8 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe,
} }
if (npiv) { 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); vport->node_name, vport->port_name);
fc_set_wwnn(lport, vport->node_name); fc_set_wwnn(lport, vport->node_name);
fc_set_wwpn(lport, vport->port_name); fc_set_wwpn(lport, vport->port_name);

21
drivers/scsi/fcoe/libfcoe.c
View File

@ -583,7 +583,7 @@ static void fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
smp_processor_id()); smp_processor_id());
stats->MissDiscAdvCount++; stats->MissDiscAdvCount++;
printk(KERN_INFO "libfcoe: host%d: Missing Discovery " 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, fip->lp->host->host_no, fcf->fabric_name,
stats->MissDiscAdvCount); 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); mtu_valid = fcoe_ctlr_mtu_valid(fcf);
fcf->time = jiffies; fcf->time = jiffies;
if (!found) { 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); 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; struct fcoe_fcf *best = NULL;
list_for_each_entry(fcf, &fip->fcfs, list) { list_for_each_entry(fcf, &fip->fcfs, list) {
LIBFCOE_FIP_DBG(fip, "consider FCF for fab %llx VFID %d map %x " LIBFCOE_FIP_DBG(fip, "consider FCF for fab %16.16llx "
"val %d\n", fcf->fabric_name, fcf->vfid, "VFID %d map %x val %d\n",
fcf->fabric_name, fcf->vfid,
fcf->fc_map, fcoe_ctlr_mtu_valid(fcf)); fcf->fc_map, fcoe_ctlr_mtu_valid(fcf));
if (!fcoe_ctlr_fcf_usable(fcf)) { if (!fcoe_ctlr_fcf_usable(fcf)) {
LIBFCOE_FIP_DBG(fip, "FCF for fab %llx map %x %svalid " LIBFCOE_FIP_DBG(fip, "FCF for fab %16.16llx "
"%savailable\n", fcf->fabric_name, "map %x %svalid %savailable\n",
fcf->fc_map, (fcf->flags & FIP_FL_SOL) fcf->fabric_name, fcf->fc_map,
? "" : "in", (fcf->flags & FIP_FL_AVAIL) (fcf->flags & FIP_FL_SOL) ? "" : "in",
? "" : "un"); (fcf->flags & FIP_FL_AVAIL) ?
"" : "un");
continue; continue;
} }
if (!best) { if (!best) {

2
drivers/scsi/libfc/fc_disc.c
View File

@ -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; rdata->ids.port_name = port_name;
else if (rdata->ids.port_name != port_name) { else if (rdata->ids.port_name != port_name) {
FC_DISC_DBG(disc, "GPN_ID accepted. WWPN changed. " 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); rdata->ids.port_id, port_name);
lport->tt.rport_logoff(rdata); lport->tt.rport_logoff(rdata);

4
drivers/scsi/libfc/fc_lport.c
View File

@ -800,11 +800,11 @@ static void fc_lport_recv_flogi_req(struct fc_seq *sp_in,
remote_wwpn = get_unaligned_be64(&flp->fl_wwpn); remote_wwpn = get_unaligned_be64(&flp->fl_wwpn);
if (remote_wwpn == lport->wwpn) { if (remote_wwpn == lport->wwpn) {
printk(KERN_WARNING "host%d: libfc: Received FLOGI from port " 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); lport->host->host_no, remote_wwpn);
goto out; 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? * XXX what is the right thing to do for FIDs?