Fixed some printf format errors (hopefully all of the remaining daddr64_t

ones for GENERIC, and all others on the same line as those).  Reformat
the printfs if necessary to avoid new long lones or old format printf
errors.

1 files changed, 10 insertions, 8 deletions

diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 708cd34..8e50cba 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -3349,8 +3349,10 @@ vm_hold_free_pages(struct buf * bp, vm_offset_t from, vm_offset_t to)
 		p = bp->b_pages[index];
 		if (p && (index < bp->b_npages)) {
 			if (p->busy) {
-				printf("vm_hold_free_pages: blkno: %lld, lblkno: %lld\n",
-					bp->b_blkno, bp->b_lblkno);
+				printf(
+			    "vm_hold_free_pages: blkno: %lld, lblkno: %lld\n",
+				    (long long)bp->b_blkno,
+				    (long long)bp->b_lblkno);
 			}
 			bp->b_pages[index] = NULL;
 			pmap_qremove(pg, 1);
@@ -3379,12 +3381,12 @@ DB_SHOW_COMMAND(buffer, db_show_buffer)
 	}
 
 	db_printf("b_flags = 0x%b\n", (u_int)bp->b_flags, PRINT_BUF_FLAGS);
-	db_printf("b_error = %d, b_bufsize = %ld, b_bcount = %ld, "
-		  "b_resid = %ld\nb_dev = (%d,%d), b_data = %p, "
-		  "b_blkno = %lld, b_pblkno = %lld\n",
-		  bp->b_error, bp->b_bufsize, bp->b_bcount, bp->b_resid,
-		  major(bp->b_dev), minor(bp->b_dev),
-		  bp->b_data, bp->b_blkno, bp->b_pblkno);
+	db_printf(
+	    "b_error = %d, b_bufsize = %ld, b_bcount = %ld, b_resid = %ld\n"
+	    "b_dev = (%d,%d), b_data = %p, b_blkno = %lld, b_pblkno = %lld\n",
+	    bp->b_error, bp->b_bufsize, bp->b_bcount, bp->b_resid,
+	    major(bp->b_dev), minor(bp->b_dev), bp->b_data,
+	    (long long)bp->b_blkno, (long long)bp->b_pblkno);
 	if (bp->b_npages) {
 		int i;
 		db_printf("b_npages = %d, pages(OBJ, IDX, PA): ", bp->b_npages);