| Message ID | 1428095522.6933.38.camel@myfc17 (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
James Smart wrote: > Fix provide host name and OS name in RSNN-NN FC-GS command > > Signed-off-by: Dick Kennedy <dick.kennedy@emulex.com> > Signed-off-by: James Smart <james.smart@emulex.com> > --- > drivers/scsi/lpfc/lpfc_ct.c | 21 +++++++++++++++++++-- > 1 file changed, 19 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c > index 61a32cd..c259eb0 100644 > --- a/drivers/scsi/lpfc/lpfc_ct.c > +++ b/drivers/scsi/lpfc/lpfc_ct.c > @@ -1074,8 +1074,25 @@ lpfc_vport_symbolic_node_name(struct lpfc_vport *vport, char *symbol, > > lpfc_decode_firmware_rev(vport->phba, fwrev, 0); > > - n = snprintf(symbol, size, "Emulex %s FV%s DV%s", > - vport->phba->ModelName, fwrev, lpfc_release_version); > + n = snprintf(symbol, size, "Emulex %s", vport->phba->ModelName); > + > + if (size < n) > + return n; > + n += snprintf(symbol + n, size - n, " FV%s", fwrev); > + > + if (size < n) > + return n; > + n += snprintf(symbol + n, size - n, " DV%s", lpfc_release_version); > + > + if (size < n) > + return n; > + n += snprintf(symbol + n, size - n, " HN:%s", init_utsname()->nodename); > + > + /* Note :- OS name is "Linux" as per requirement BZ168199. */ > + if (size < n) > + return n; > + n += snprintf(symbol + n, size - n, " OS:%s", init_utsname()->sysname); > + > return n; > } Care to disclose which bugzilla contains BZ168199? Sebastian -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 4/5/2015 8:07 AM, Sebastian Herbszt wrote: > James Smart wrote: >> + /* Note :- OS name is "Linux" as per requirement BZ168199. */ >> + if (size < n) >> + return n; >> + n += snprintf(symbol + n, size - n, " OS:%s", init_utsname()->sysname); >> + >> return n; >> } > Care to disclose which bugzilla contains BZ168199? > > It's meaningless as it's Emulex's bugzilla database, per our own requirements. You will see in the v3 patches just posted I just nixed this. -- james s -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/03/2015 11:12 PM, James Smart wrote: > Fix provide host name and OS name in RSNN-NN FC-GS command > > Signed-off-by: Dick Kennedy <dick.kennedy@emulex.com> > Signed-off-by: James Smart <james.smart@emulex.com> > --- Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c index 61a32cd..c259eb0 100644 --- a/drivers/scsi/lpfc/lpfc_ct.c +++ b/drivers/scsi/lpfc/lpfc_ct.c @@ -1074,8 +1074,25 @@ lpfc_vport_symbolic_node_name(struct lpfc_vport *vport, char *symbol, lpfc_decode_firmware_rev(vport->phba, fwrev, 0); - n = snprintf(symbol, size, "Emulex %s FV%s DV%s", - vport->phba->ModelName, fwrev, lpfc_release_version); + n = snprintf(symbol, size, "Emulex %s", vport->phba->ModelName); + + if (size < n) + return n; + n += snprintf(symbol + n, size - n, " FV%s", fwrev); + + if (size < n) + return n; + n += snprintf(symbol + n, size - n, " DV%s", lpfc_release_version); + + if (size < n) + return n; + n += snprintf(symbol + n, size - n, " HN:%s", init_utsname()->nodename); + + /* Note :- OS name is "Linux" as per requirement BZ168199. */ + if (size < n) + return n; + n += snprintf(symbol + n, size - n, " OS:%s", init_utsname()->sysname); + return n; }