From nobody Tue Dec 30 12:51:18 2025 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 4dgXyZ36kYz6LsRx for ; Tue, 30 Dec 2025 12:51:18 +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 4dgXyZ2W0Qz3R0m for ; Tue, 30 Dec 2025 12:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767099078; 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=N51n0MrGe/tPRbNDghTqAHA5Z7vi6bwC/b6ngUHgj7Q=; b=Ws8GhM/C2Qldp38++xygsFDRHH4uaNmsCVpiucTVEaGkRgIhRJ9menf8RlkcsswD6jDvaw 157qVZyHfP4oV8vBkWw4VHPJGsPwK+ZMXwJCLcnpSLqS4t1ki6pnepPdeRTGpdKLdFZCy7 YTtBl/CGZkaUQyBNiVF4Jb3DDfl0bsTphNPBmF7m5jxrCSQWRK2t7CX49l4w8BsFfKULkL E9Xh60Zzzv2bwJrBrk83nQ9Oyyx/a9XSnysR0Hnu9c3y5GcvpubBhhZJyuQe22dWOOYgd8 UYjNe5VWTUQ+M7D05Ny/aSsBJNBWRTFZojVnwbJO3zKgAVp3Kg/NKYYVzs1kTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767099078; 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=N51n0MrGe/tPRbNDghTqAHA5Z7vi6bwC/b6ngUHgj7Q=; b=quAwmeIt6JzgI2a/+CN7cFqhTSDl6fKrTaMVZMZC4p4N66e2PmjzsbR5sTU28NSiOe6gjo GlbFl5DY2PGqNJZox/H5FYR7A7BiVLuPEByU2dWQmW+eo+qgMiK5t/uKxCkBRwXloJHXRy gObNs9ml1ldEik6EdkJzqU2ZYBiqGxjGv8u+IzDHLMpUV66/CGidDJvj9jEDDh9T1L83wF oyyrb5gCLSspzi1RnEdBCd2hmmOEn5QvErWFCeKxjXNrowNxUR+9dCLJk0bJV0QX+IIqjo Vb3L1GHl/fquF3UomgY7KiMDLabQLmzwmKY025lhclVRfWQNmeSox0w6YZl+QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767099078; a=rsa-sha256; cv=none; b=HYoLRoZCAOLTESAEIlQ4XE6d+1hh1dapRznVeB1Vutr0iHeBK+AXYvZbHNtKSbYDLN/XU/ eHdG+AalgjWUSZ7j1/m754n8rc93BohS65sUqdUardb/KyHLu0wNDYE3jIqthMZlbB00+v xMuSM9/TJw1msCLslKFVObuPpzCgZSuk1shZr9lw+nufeHWI7a2w9ISy6m8X0d05ttdXDo FEHmu2usdZqJQ67C+LEiHRaUOTp7N0pxni0qZkR4v/HV/dWzXTHW2WgViFaUS5w3TKQqlL WNLuEEe4fSdxs2SQm0IRQkYlP/PpYIto7/bB7kCPqPnj2DxCpVWMV0foG11khw== 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 4dgXyZ1sfnz10l9 for ; Tue, 30 Dec 2025 12:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a2c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 12:51:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: bcd9ea853b14 - main - zfs: rename several printf attribute declarations to __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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: bcd9ea853b14c85a61eb9079c59e966eed336578 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 12:51:18 +0000 Message-Id: <6953cac6.3a2c6.5dd38de3@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd9ea853b14c85a61eb9079c59e966eed336578 commit bcd9ea853b14c85a61eb9079c59e966eed336578 Author: Dimitry Andric AuthorDate: 2025-12-30 12:50:24 +0000 Commit: Dimitry Andric CommitDate: 2025-12-30 12:50:45 +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 --- 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 0f021d15157b..6fe5cf062c17 100644 --- a/sys/contrib/openzfs/include/sys/zfs_debug.h +++ b/sys/contrib/openzfs/include/sys/zfs_debug.h @@ -68,7 +68,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():