svn commit: r316173 - stable/10/sys/dev/isp

[Alexander Motin]

Author: mav
Date: Wed Mar 29 19:25:42 2017
New Revision: 316173
URL: https://svnweb.freebsd.org/changeset/base/316173

Log:
  Fix build broken by different size of lun_id_t.

Modified:
  stable/10/sys/dev/isp/isp_freebsd.c
  stable/10/sys/dev/isp/isp_target.c

Modified: stable/10/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/10/sys/dev/isp/isp_freebsd.c	Wed Mar 29 19:25:31 2017	(r316172)
+++ stable/10/sys/dev/isp/isp_freebsd.c	Wed Mar 29 19:25:42 2017	(r316173)
@@ -2369,7 +2369,7 @@ isp_handle_platform_target_tmf(ispsoftc_
 	atio_private_data_t *atp;
 	lun_id_t lun;
 
-	isp_prt(isp, ISP_LOGTDEBUG0, "%s: code 0x%x sid  0x%x tagval 0x%016llx chan %d lun %jx", __func__, notify->nt_ncode,
+	isp_prt(isp, ISP_LOGTDEBUG0, "%s: code 0x%x sid  0x%x tagval 0x%016llx chan %d lun %x", __func__, notify->nt_ncode,
 	    notify->nt_sid, (unsigned long long) notify->nt_tagval, notify->nt_channel, notify->nt_lun);
 	if (notify->nt_lun == LUN_ANY) {
 		if (notify->nt_tagval == TAG_ANY) {

Modified: stable/10/sys/dev/isp/isp_target.c
==============================================================================
--- stable/10/sys/dev/isp/isp_target.c	Wed Mar 29 19:25:31 2017	(r316172)
+++ stable/10/sys/dev/isp/isp_target.c	Wed Mar 29 19:25:42 2017	(r316173)
@@ -606,8 +606,8 @@ static void
 isp_got_msg_fc(ispsoftc_t *isp, in_fcentry_t *inp)
 {
 	isp_notify_t notify;
-	static const char f1[] = "%s from N-port handle 0x%x lun %jx seq 0x%x";
-	static const char f2[] = "unknown %s 0x%x lun %jx N-Port handle 0x%x task flags 0x%x seq 0x%x\n";
+	static const char f1[] = "%s from N-port handle 0x%x lun %x seq 0x%x";
+	static const char f2[] = "unknown %s 0x%x lun %x N-Port handle 0x%x task flags 0x%x seq 0x%x\n";
 	uint16_t seqid, nphdl;
 
 	ISP_MEMZERO(&notify, sizeof (isp_notify_t));
@@ -669,8 +669,8 @@ static void
 isp_got_tmf_24xx(ispsoftc_t *isp, at7_entry_t *aep)
 {
 	isp_notify_t notify;
-	static const char f1[] = "%s from PortID 0x%06x lun %jx seq 0x%08x";
-	static const char f2[] = "unknown Task Flag 0x%x lun %jx PortID 0x%x tag 0x%08x";
+	static const char f1[] = "%s from PortID 0x%06x lun %x seq 0x%08x";
+	static const char f2[] = "unknown Task Flag 0x%x lun %x PortID 0x%x tag 0x%08x";
 	fcportdb_t *lp;
 	uint16_t chan;
 	uint32_t sid, did;