Merge head

2 files changed, 8 insertions, 7 deletions

diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
index 9a21dde65b38..1621fe62cf16 100644
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@@ -42,6 +42,6 @@ MLINKS+=	cam.3 cam_open_device.3 \
 SDIR=		${.CURDIR}/../../sys
 CFLAGS+=	-I${.CURDIR} -I${SDIR}
 
-SHLIB_MAJOR=	6
+SHLIB_MAJOR=	7
 
 .include <bsd.lib.mk>
diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c
index cd5992286054..f3202470a0e2 100644
--- a/lib/libcam/camlib.c
+++ b/lib/libcam/camlib.c
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -348,16 +349,16 @@ cam_open_btl(path_id_t path_id, target_id_t target_id, lun_id_t target_lun,
 	if (ccb.cdm.status == CAM_DEV_MATCH_MORE) {
 		snprintf(cam_errbuf, CAM_ERRBUF_SIZE,
 			 "%s: CDM reported more than one"
-			 " passthrough device at %d:%d:%d!!\n",
-			 func_name, path_id, target_id, target_lun);
+			 " passthrough device at %d:%d:%jx!!\n",
+			 func_name, path_id, target_id, (uintmax_t)target_lun);
 		goto btl_bailout;
 	}
 
 	if (ccb.cdm.num_matches == 0) {
 		snprintf(cam_errbuf, CAM_ERRBUF_SIZE,
 			 "%s: no passthrough device found at"
-			 " %d:%d:%d", func_name, path_id, target_id,
-			 target_lun);
+			 " %d:%d:%jx", func_name, path_id, target_id,
+			 (uintmax_t)target_lun);
 		goto btl_bailout;
 	}
 
@@ -687,14 +688,14 @@ cam_path_string(struct cam_device *dev, char *str, int len)
 		return(str);
 	}
 
-	snprintf(str, len, "(%s%d:%s%d:%d:%d:%d): ",
+	snprintf(str, len, "(%s%d:%s%d:%d:%d:%jx): ",
 		 (dev->device_name[0] != '\0') ? dev->device_name : "pass",
 		 dev->dev_unit_num,
 		 (dev->sim_name[0] != '\0') ? dev->sim_name : "unknown",
 		 dev->sim_unit_number,
 		 dev->bus_id,
 		 dev->target_id,
-		 dev->target_lun);
+		 (uintmax_t)dev->target_lun);
 
 	return(str);
 }