diff options
author | bde <bde@FreeBSD.org> | 2002-03-19 04:09:21 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 2002-03-19 04:09:21 +0000 |
commit | df8144b98ef4c0ee0504b9c85b88578d1946608b (patch) | |
tree | a5d297c77d0f534909c74d76de09868a41fee4bf /sys | |
parent | c75458a00460e8a054b2cb7a51c7e2d481fccb58 (diff) | |
download | FreeBSD-src-df8144b98ef4c0ee0504b9c85b88578d1946608b.zip FreeBSD-src-df8144b98ef4c0ee0504b9c85b88578d1946608b.tar.gz |
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.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/kern/vfs_bio.c | 18 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_snapshot.c | 11 |
2 files changed, 16 insertions, 13 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); diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index a14fbea..e661d73 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -1102,9 +1102,10 @@ ffs_snapblkfree(fs, devvp, bno, size, inum) } #ifdef DEBUG if (snapdebug) - printf("%s%d lbn %d for inum %d size %ld to blkno %lld\n", - "Copyonremove: snapino ", ip->i_number, lbn, - inum, size, cbp->b_blkno); + printf( +"Copyonremove: snapino %lu lbn %ld for inum %lu size %ld to blkno %lld\n", + (unsigned long)ip->i_number, (long)lbn, + (unsigned long)inum, size, (long long)cbp->b_blkno); #endif /* * If we have already read the old block contents, then @@ -1320,8 +1321,8 @@ retry: printf("fs metadata"); else printf("inum %d", VTOI(bp->b_vp)->i_number); - printf(" lblkno %lld to blkno %lld\n", bp->b_lblkno, - cbp->b_blkno); + printf(" lblkno %lld to blkno %lld\n", + (long long)bp->b_lblkno, (long long)cbp->b_blkno); } #endif /* |