From nobody Thu Jan 13 09:49:07 2022 X-Original-To: dev-commits-src-branches@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 18CF012D2352; Thu, 13 Jan 2022 09:49:11 +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 4JZKQD4SqBz4jCj; Thu, 13 Jan 2022 09:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642067348; 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=o36VdmiZBULt1KWsNRmxmY+Pnl33E5UdQ+3amyAl29g=; b=jekF5CB9y0Q6aZ7Xr9KS03j4r1gSVF9aqbr+lVHOb3z+pM0XZ/DJnhgoXb+V9/i+JmokyE OK1Wl5Ukp8c0xPhXJa90CxSFKH868TZD/ar9PO3UTN+m0pZUFIxEkmb9zUqIvM1Xuq8qE9 f5V3m8fRGeJqxrV/bHJXJ6DroGsNcWmgc7WVXLsA2Wb4e/gbcq5ua51H/hSK7uVZDjWZWA tzlz9QEY9PPWlvMVaNoG4ACMGRbnpcVeUW1hl741PTerzsyavmtZXOVZDL6YWqFDXuMZBx YpdZ0TrAix7UM48j3N3xClG2CbZDkH63D6lUnePVuDwTIfgHvupa15p2lYYv/w== 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 F0B1C1E4AA; Thu, 13 Jan 2022 09:49:07 +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 20D9n7b8095978; Thu, 13 Jan 2022 09:49:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20D9n7TY095977; Thu, 13 Jan 2022 09:49:07 GMT (envelope-from git) Date: Thu, 13 Jan 2022 09:49:07 GMT Message-Id: <202201130949.20D9n7TY095977@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: c95afea4a8a9 - stable/13 - loader: bcache: Fix debug printf List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: c95afea4a8a9d3ec07d1ab446cca30f25913c523 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642067348; 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=o36VdmiZBULt1KWsNRmxmY+Pnl33E5UdQ+3amyAl29g=; b=OighHvP7GJsPI02S42AHm3fW1eD/C5v9/9BVv9p5SU+d+OpWjvKD0yQJbwMSFhA0IRKrEO crE7WDCHOw/EcKglDxekUuP6ywboXYYdOq4Rks6TjMbCDPDddenVd8mmXLD1v6fVNaGqQQ 6vkxfWI7l7KVb/r7Asj8y6lqhFUW6exZ2xLe6pMyQ8dWRH+XNZYBlXBZuIYlMhd72K7bhT l71GxzEj9Xck2bZK2sKIeXY55xzJTZBQ0Msljrdbgs4osL6wz6o9SKUmyFwRQ4gw2Ncshe cy9162n5VFWpCDn0knDPvy/6nPeQtd58I8d0R0KCZblHhYUPmcLVb9z6903sdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642067348; a=rsa-sha256; cv=none; b=UBEoK/oMOPIUuKD0t8LJyxt/RLBx294r64Y6Zwq64ioFOCtQy+E4ilCi4VT04qVqE3O88Y bW2SCNV99ZDwNoYIJB+12SGPq8Lo9liXFgajpJQaO3B0QWuH/TKvZ1LsEr7eKU7FZrw+TK zDDPuHaHDTVtXCXWUEJuhZly2DO88Pyt+Jxegzx681L3KwMitPsGz5zVxR8H7LOa2+DROV 7UptYPHk6oWw2tDYNyQmR7Aw++2c9uCqh9nsDUlAj9Hzz4iD0OEi8eJ4zcDs4uS5EPx8xM o5fBT5KpBrDPA+ZfQgO8J98Xm0VGD3eOcyVIMLVhCiccVTEoVuYdP+PIwhWgpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=c95afea4a8a9d3ec07d1ab446cca30f25913c523 commit c95afea4a8a9d3ec07d1ab446cca30f25913c523 Author: Emmanuel Vadot AuthorDate: 2021-12-13 08:23:19 +0000 Commit: Emmanuel Vadot 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); } }