Make sure daddr64_t values get printed with %lld.

ok deraadt@

2 files changed, 13 insertions, 13 deletions

diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 4b7fcf17a9a..1a9084a207b 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_softdep.c,v 1.110 2011/08/17 15:48:22 thib Exp $	*/
+/*	$OpenBSD: ffs_softdep.c,v 1.111 2011/09/18 11:18:28 miod Exp $	*/
 
 /*
  * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -1532,7 +1532,7 @@ allocdirect_merge(struct allocdirectlst *adphead, struct allocdirect *newadp,
 	    newadp->ad_oldsize != oldadp->ad_newsize ||
 	    newadp->ad_lbn >= NDADDR) {
 		FREE_LOCK(&lk);
-		panic("allocdirect_merge: old %d != new %d || lbn %ld >= %d",
+		panic("allocdirect_merge: old %lld != new %lld || lbn %lld >= %d",
 		    newadp->ad_oldblkno, oldadp->ad_newblkno, newadp->ad_lbn,
 		    NDADDR);
 	}
@@ -3432,14 +3432,14 @@ initiate_write_inodeblock_ufs1(struct inodedep *inodedep, struct buf *bp)
 		if (adp->ad_lbn < NDADDR &&
 		    (d1 = dp->di_db[adp->ad_lbn]) != (d2 = adp->ad_newblkno)) {
 			FREE_LOCK(&lk);
-			panic("%s: direct pointer #%ld mismatch %d != %d",
+			panic("%s: direct pointer #%lld mismatch %d != %d",
 			    "softdep_write_inodeblock", adp->ad_lbn, d1, d2);
 		}
 		if (adp->ad_lbn >= NDADDR &&
 		    (d1 = dp->di_ib[adp->ad_lbn - NDADDR]) !=
 		    (d2 = adp->ad_newblkno)) {
 			FREE_LOCK(&lk);
-			panic("%s: indirect pointer #%ld mismatch %d != %d",
+			panic("%s: indirect pointer #%lld mismatch %d != %d",
 			    "softdep_write_inodeblock", adp->ad_lbn - NDADDR,
 			    d1, d2);
 		}
@@ -3645,14 +3645,14 @@ initiate_write_inodeblock_ufs2(struct inodedep *inodedep, struct buf *bp)
 		if (adp->ad_lbn < NDADDR &&
 		    (d1 = dp->di_db[adp->ad_lbn]) != (d2 = adp->ad_newblkno)) {
 			FREE_LOCK(&lk);
-			panic("%s: direct pointer #%ld mismatch %ld != %ld",
+			panic("%s: direct pointer #%lld mismatch %lld != %lld",
 			    "softdep_write_inodeblock", adp->ad_lbn, d1, d2);
 		}
 		if (adp->ad_lbn >= NDADDR &&
 		    (d1 = dp->di_ib[adp->ad_lbn - NDADDR]) !=
 		    (d2 = adp->ad_newblkno)) {
 			FREE_LOCK(&lk);
-			panic("%s: indirect pointer #%ld mismatch %ld != %ld",
+			panic("%s: indirect pointer #%lld mismatch %lld != %lld",
 			    "softdep_write_inodeblock", adp->ad_lbn - NDADDR,
 			    d1, d2);
 		}
@@ -4039,7 +4039,7 @@ handle_written_inodeblock(struct inodedep *inodedep, struct buf *bp)
 		if (fstype == UM_UFS1) {
 			if (adp->ad_lbn < NDADDR) {
 				if (dp1->di_db[adp->ad_lbn] != adp->ad_oldblkno)
-					 panic("%s: %s #%ld mismatch %d != %d",
+					 panic("%s: %s #%lld mismatch %d != %lld",
 					     "handle_written_inodeblock",
 					     "direct pointer", adp->ad_lbn,
 					     dp1->di_db[adp->ad_lbn],
@@ -4047,7 +4047,7 @@ handle_written_inodeblock(struct inodedep *inodedep, struct buf *bp)
 				dp1->di_db[adp->ad_lbn] = adp->ad_newblkno;
 			} else {
 				if (dp1->di_ib[adp->ad_lbn - NDADDR] != 0)
-					panic("%s: %s #%ld allocated as %d",
+					panic("%s: %s #%lld allocated as %d",
 					    "handle_written_inodeblock",
 					    "indirect pointer",
 					    adp->ad_lbn - NDADDR,
@@ -4058,7 +4058,7 @@ handle_written_inodeblock(struct inodedep *inodedep, struct buf *bp)
 		} else {
 			if (adp->ad_lbn < NDADDR) {
 				if (dp2->di_db[adp->ad_lbn] != adp->ad_oldblkno)
-					panic("%s: %s #%ld mismatch %d != %d",
+					panic("%s: %s #%lld mismatch %lld != %lld",
 					    "handle_written_inodeblock",
 					    "direct pointer", adp->ad_lbn,
 					    dp2->di_db[adp->ad_lbn],
@@ -4066,7 +4066,7 @@ handle_written_inodeblock(struct inodedep *inodedep, struct buf *bp)
 				dp2->di_db[adp->ad_lbn] = adp->ad_newblkno;
 			} else {
 				if (dp2->di_ib[adp->ad_lbn - NDADDR] != 0)
-					panic("%s: %s #%ld allocated as %d",
+					panic("%s: %s #%lld allocated as %lld",
 					    "handle_written_inodeblock",
 					    "indirect pointer",
 					    adp->ad_lbn - NDADDR,
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 377bb78718b..ef72bd84c81 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_bmap.c,v 1.30 2011/07/04 20:35:35 deraadt Exp $	*/
+/*	$OpenBSD: ufs_bmap.c,v 1.31 2011/09/18 11:18:28 miod Exp $	*/
 /*	$NetBSD: ufs_bmap.c,v 1.3 1996/02/09 22:36:00 christos Exp $	*/
 
 /*
@@ -242,7 +242,7 @@ ufs_getlbns(struct vnode *vp, daddr64_t bn, struct indir *ap, int *nump)
 
 #ifdef DIAGNOSTIC
 	if (realbn < 0 && realbn > -NDADDR) {
-		panic ("ufs_getlbns: Invalid indirect block %d specified",
+		panic ("ufs_getlbns: Invalid indirect block %lld specified",
 		    realbn);
 	}
 #endif
@@ -299,7 +299,7 @@ ufs_getlbns(struct vnode *vp, daddr64_t bn, struct indir *ap, int *nump)
 	}
 #ifdef DIAGNOSTIC
 	if (realbn < 0 && metalbn != realbn) {
-		panic("ufs_getlbns: indirect block %d not found", realbn);
+		panic("ufs_getlbns: indirect block %lld not found", realbn);
 	}
 #endif
 	if (nump)