git: 3ff5432f9262 - stable/12 - Fix 32-bit build post 6733401935f83754b4b2744bc3d33ef84b1271e0

Warner Losh imp at FreeBSD.org
Sat Jul 31 02:02:22 UTC 2021


The branch stable/12 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=3ff5432f9262b69db4fdac328c16ae6381e837ac

commit 3ff5432f9262b69db4fdac328c16ae6381e837ac
Author:     Dimitry Andric <dim at FreeBSD.org>
AuthorDate: 2021-01-08 22:38:21 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-07-31 02:01:01 +0000

    Fix 32-bit build post 6733401935f83754b4b2744bc3d33ef84b1271e0
    
    The general style in sbin/nvmecontrol apppears to print uint64_t types
    using %j, so I'm using that instead of the more general (but admittedly
    ugly) PRIu64.
    
    (cherry picked from commit a82f07fc2e2456b0ddc847d611f56a3152a6f940)
---
 sbin/nvmecontrol/logpage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c
index f00d5d94897b..7daf012499a2 100644
--- a/sbin/nvmecontrol/logpage.c
+++ b/sbin/nvmecontrol/logpage.c
@@ -678,7 +678,7 @@ print_log_self_test_status(const struct nvme_controller_data *cdata __unused,
 		if (dst->result[r].valid_diag_info & BIT(1)) {
 			memcpy(&failing_lba, dst->result[r].failing_lba,
 			    sizeof(failing_lba));
-			printf(" FLBA=0x%lx", failing_lba);
+			printf(" FLBA=0x%jx", failing_lba);
 		}
 		if (dst->result[r].valid_diag_info & BIT(2))
 			printf(" SCT=0x%x", dst->result[r].status_code_type);


More information about the dev-commits-src-branches mailing list