git: c95afea4a8a9 - stable/13 - loader: bcache: Fix debug printf
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 13 Jan 2022 09:49:07 UTC
The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=c95afea4a8a9d3ec07d1ab446cca30f25913c523 commit c95afea4a8a9d3ec07d1ab446cca30f25913c523 Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2021-12-13 08:23:19 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2022-01-13 07:58:46 +0000 loader: bcache: Fix debug printf Use %j to it works on 64 and 32 bits system. Reviewed by: imp, tsoome MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33430 (cherry picked from commit 8ed8b4203a2f9b1bd337b8af26021ae2240a0ee8) --- stand/common/bcache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stand/common/bcache.c b/stand/common/bcache.c index 99c78b0346b7..88dee8c7ce2d 100644 --- a/stand/common/bcache.c +++ b/stand/common/bcache.c @@ -408,7 +408,7 @@ bcache_strategy(void *devdata, int rw, daddr_t blk, size_t size, /* bypass large requests, or when the cache is inactive */ if (bc == NULL || ((size * 2 / bcache_blksize) > bcache_nblks)) { - DPRINTF("bypass %zu from %qu", size / bcache_blksize, blk); + DPRINTF("bypass %zu from %jd", size / bcache_blksize, blk); bcache_bypasses++; rw &= F_MASK; return (dd->dv_strategy(dd->dv_devdata, rw, blk, size, buf, rsize)); @@ -481,7 +481,7 @@ bcache_insert(struct bcache *bc, daddr_t blkno) cand = BHASH(bc, blkno); - DPRINTF("insert blk %llu -> %u # %d", blkno, cand, bcache_bcount); + DPRINTF("insert blk %jd -> %u # %d", blkno, cand, bcache_bcount); bc->bcache_ctl[cand].bc_blkno = blkno; bc->bcache_ctl[cand].bc_count = bcache_bcount++; } @@ -498,7 +498,7 @@ bcache_invalidate(struct bcache *bc, daddr_t blkno) if (bc->bcache_ctl[i].bc_blkno == blkno) { bc->bcache_ctl[i].bc_count = -1; bc->bcache_ctl[i].bc_blkno = -1; - DPRINTF("invalidate blk %llu", blkno); + DPRINTF("invalidate blk %ju", blkno); } }