From nobody Thu Dec 16 10:53:25 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BBDC218F105E; Thu, 16 Dec 2021 10:53:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JF89K6qQNz4f6s; Thu, 16 Dec 2021 10:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8FA262EE24; Thu, 16 Dec 2021 10:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BGArPb8091232; Thu, 16 Dec 2021 10:53:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BGArPaC091231; Thu, 16 Dec 2021 10:53:25 GMT (envelope-from git) Date: Thu, 16 Dec 2021 10:53:25 GMT Message-Id: <202112161053.1BGArPaC091231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 8ed8b4203a2f - main - loader: bcache: Fix debug printf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ed8b4203a2f9b1bd337b8af26021ae2240a0ee8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639652006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ciYyL2wPRnEDgabjOlS+lqSwB4wnm65vq5BdSKFEC8=; b=davczNdkeh7WoZDemPylFWTiGAjdc7XXrrTthB+pnSDsraCmiWyl0Gt05GPp7HUhRhLiQ2 6kpWpUqB/9ya9hPyCevSlbuCwwbUeULmWFjfK7a18Z0exkfViqERST4+5uus5A8JUUrT51 gLlLXmn8Ulc+1djXSzz+1nHhJNV/YqEyFKm8QTALi5BVl0rIokCkKT/ly1x+kR9zSq2OoV kclt7gockpc+B3Yn3BXnmLQIK97F24apTFVpbWlLsDdTSpY39jEtdH/v1gPEZbizaMdro3 j1am88L0Kto5UbeBAgd1vAbI9yaT+p5LYAK8zKdRQm1nXY6mVPyMD0yPh/BN5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639652006; a=rsa-sha256; cv=none; b=uHbPpKG43E2FOAXomBAx/1Kj2dbUoZ7wNPg+Op/Mkeu40gKz4SzVD6vlprZKAiLEdevKJ5 pf8MWxvniTF6PI59s3zQiwxKILG22WR6EV9LumKlC+OjCn5tmsOkCzcSJdAt0PkHb6a6zo cbjzesOMX7fTzsnoE7vIiIBZiVkTQRv8FBlpJ0r3FH9DAeV6LZJDwaf9TJa566ai/8eOnM 9WnzI5dKcXyFAm8WOIPx3txoPJ45lkuLytk0g7EjykuOvfO23Wme9vPAtYkriZRMxTw2rt KsBb0tPwcIp9Lq2Vec2VQN/kJkKE+CT7sRS4WGnFVU2VdNZLRX96U/I5y/haMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=8ed8b4203a2f9b1bd337b8af26021ae2240a0ee8 commit 8ed8b4203a2f9b1bd337b8af26021ae2240a0ee8 Author: Emmanuel Vadot AuthorDate: 2021-12-13 08:23:19 +0000 Commit: Emmanuel Vadot CommitDate: 2021-12-16 10:50:43 +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 --- 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); } }