From nobody Fri Jan 2 20:51:54 2026 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 4djbTk6RLYz6MFdQ for ; Fri, 02 Jan 2026 20:51:54 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbTk40tzz3qCy for ; Fri, 02 Jan 2026 20:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387114; 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=NQNiZBUBQq2PH43ZCZ5xlhpEi67viKcECzpAZdQVgg8=; b=QU8MBu9l1nlVetuP2FmnohHIGJjWrkJbQom6CFxhH0EoRNvwFJ4tGU1ohn6dYnMPRLKD+d LtxfZHvnXa6NAH1TNH0NrKv5Z6qyLrVeb2/G2Xiz50Bh0OXF9bghl/w8cylWjU2Tnc3hwU 9xSykqkzqB58GgfoT5ymO/DJR8W2XGuuR3oXEnwbf3mqAiYn9bA5XD+dDACD6Yf5Evs+UK 18DuI6bYIlkpDe9gqWx3CJyEWXuAkrHIgCKEWobKq2NOObuhGnCGp4cBApeYmxJRkfkl87 Z7Qlr4P3OvNM/qXy53fIqgfqM/+xWs8dtyESdyidX2f2nCHKUWJaQeLI4AR8zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387114; 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=NQNiZBUBQq2PH43ZCZ5xlhpEi67viKcECzpAZdQVgg8=; b=fzVOS4cAkALElDT6NCljbB17oMUpo4Y6Hro/MVXWbB+Avc1qYQgGSawDFNWEUjdwkZN0I8 6F8ZFKsckUpt/x7j5wN2kChEs001WxGVaHXu3TepIRnCCj6QNidSSC/PlF8aPtuKlRwfdX zk15r8RHVpnRXrpEUfRySviBm5wPvWF/o1Wn2GE3EB5h9hMENDp+3hIyRjN3tNZ7l6Pahc uZEgvPAtcXV+M1F5Jtz0tmhUDiDmqc8NRk7PvLkc5xPgVhVaBRMMX0DHaiXNT/c1N7KvGj tp7dZZoJBdLAl+E3muWmIEtlNLlM4bgKetUAjG7LC2uQUy9n90PYnVNUNyOQtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387114; a=rsa-sha256; cv=none; b=HiiwK6ddah9vh1wOWb8/wcbzfEMdVMpvE2gGjxxP+nCAWtPTFZjUp6hSxClL9bV7uk5yCg s3KhFYcu9NjEn95mFBwbDKrv8tdTY/2GvloidYTRTwFlTBqzJK0FrURb6TkX8ykOYhaC7w Fb2ipH8qsDHM2ucAh1FI1sO5rw2vT7ub9WPFSmz1VB2DSr6j271jcotlfB8NSTlZq1eMp3 U/YO6dhTiNWIpCDw2F4s5BuChZXXYxaLsN8+IQFHHKec6GrVANhmqpJJzeIP7xnzukc2+2 LUVhuBoRSo7SeIsovBUzyqZkXMroRPSa+44NaAtmln2+eHlTgY5uAu+pKQLkVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbTk3PF3zZTg for ; Fri, 02 Jan 2026 20:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b96e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:51:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 9c0bedbb2064 - stable/15 - zfs: rename several printf attribute declarations to __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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9c0bedbb2064e9e02e2c20d1aa909360924033d7 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:51:54 +0000 Message-Id: <69582fea.b96e.2a316b69@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9c0bedbb2064e9e02e2c20d1aa909360924033d7 commit 9c0bedbb2064e9e02e2c20d1aa909360924033d7 Author: Dimitry Andric AuthorDate: 2025-12-30 12:50:24 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:41:41 +0000 zfs: rename several printf attribute declarations to __printf__ For kernel builds, we redefine `__printf__` to `__freebsd_kprintf__`, to support FreeBSD kernel printf(9) extensions with clang. In OpenZFS various printf related functions are declared with __attribute__((format(printf, X, Y))), so these won't work with the above redefinition. With clang 21 and higher, this leads to errors similar to: sys/contrib/openzfs/module/zfs/spa_misc.c:414:38: error: passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat] 414 | (void) vsnprintf(buf, sizeof (buf), fmt, adx); | ^ Since attribute names can always be spelled with leading and trailing double underscores, rename these instances. Note that in FreeBSD proper we usually use `__printflike` from , but that does not apply to OpenZFS. Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54388 (cherry picked from commit bcd9ea853b14c85a61eb9079c59e966eed336578) --- sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h | 16 ++++++++-------- sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h | 4 ++-- sys/contrib/openzfs/include/sys/spa.h | 4 ++-- sys/contrib/openzfs/include/sys/vdev.h | 2 +- sys/contrib/openzfs/include/sys/zfs_debug.h | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h index 93dd1196d977..fa55b3917669 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h @@ -52,28 +52,28 @@ extern "C" { #ifndef _ASM extern void cmn_err(int, const char *, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vzcmn_err(zoneid_t, int, const char *, __va_list) - __attribute__((format(printf, 3, 0))); + __attribute__((format(__printf__, 3, 0))); extern void vcmn_err(int, const char *, __va_list) - __attribute__((format(printf, 2, 0))); + __attribute__((format(__printf__, 2, 0))); extern void zcmn_err(zoneid_t, int, const char *, ...) - __attribute__((format(printf, 3, 4))); + __attribute__((format(__printf__, 3, 4))); extern void vzprintf(zoneid_t, const char *, __va_list) - __attribute__((format(printf, 2, 0))); + __attribute__((format(__printf__, 2, 0))); extern void zprintf(zoneid_t, const char *, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vuprintf(const char *, __va_list) - __attribute__((format(printf, 1, 0))); + __attribute__((format(__printf__, 1, 0))); extern void panic(const char *, ...) - __attribute__((format(printf, 1, 2), __noreturn__)); + __attribute__((format(__printf__, 1, 2), __noreturn__)); #define cmn_err_once(ce, ...) \ do { \ diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h index a9619d7d0219..4ae96c91a5f3 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h @@ -55,9 +55,9 @@ MALLOC_DECLARE(M_SOLARIS); typedef struct vmem vmem_t; extern char *kmem_asprintf(const char *, ...) - __attribute__((format(printf, 1, 2))); + __attribute__((format(__printf__, 1, 2))); extern char *kmem_vasprintf(const char *fmt, va_list ap) - __attribute__((format(printf, 1, 0))); + __attribute__((format(__printf__, 1, 0))); extern int kmem_scnprintf(char *restrict str, size_t size, const char *restrict fmt, ...); diff --git a/sys/contrib/openzfs/include/sys/spa.h b/sys/contrib/openzfs/include/sys/spa.h index 2a4cc60c4aa8..db30b5a066de 100644 --- a/sys/contrib/openzfs/include/sys/spa.h +++ b/sys/contrib/openzfs/include/sys/spa.h @@ -1127,9 +1127,9 @@ extern void spa_set_allocator(spa_t *spa, const char *allocator); /* Miscellaneous support routines */ extern void spa_load_failed(spa_t *spa, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void spa_load_note(spa_t *spa, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void spa_activate_mos_feature(spa_t *spa, const char *feature, dmu_tx_t *tx); extern void spa_deactivate_mos_feature(spa_t *spa, const char *feature); diff --git a/sys/contrib/openzfs/include/sys/vdev.h b/sys/contrib/openzfs/include/sys/vdev.h index 510474d6c085..86f2235f03ac 100644 --- a/sys/contrib/openzfs/include/sys/vdev.h +++ b/sys/contrib/openzfs/include/sys/vdev.h @@ -54,7 +54,7 @@ extern int zfs_nocacheflush; typedef boolean_t vdev_open_children_func_t(vdev_t *vd); extern void vdev_dbgmsg(vdev_t *vd, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vdev_dbgmsg_print_tree(vdev_t *, int); extern int vdev_open(vdev_t *); extern void vdev_open_children(vdev_t *); diff --git a/sys/contrib/openzfs/include/sys/zfs_debug.h b/sys/contrib/openzfs/include/sys/zfs_debug.h index 4d4cd4c39e97..87fafec0c9e7 100644 --- a/sys/contrib/openzfs/include/sys/zfs_debug.h +++ b/sys/contrib/openzfs/include/sys/zfs_debug.h @@ -67,7 +67,7 @@ extern int zfs_dbgmsg_enable; extern void __set_error(const char *file, const char *func, int line, int err); extern void __zfs_dbgmsg(char *buf); extern void __dprintf(boolean_t dprint, const char *file, const char *func, - int line, const char *fmt, ...) __attribute__((format(printf, 5, 6))); + int line, const char *fmt, ...) __attribute__((format(__printf__, 5, 6))); /* * Some general principles for using zfs_dbgmsg():