Hi,
On 29.11.2023 10:14, Baptiste Daroussin wrote:
On Tue, Nov 28, 2023 at 08:36:14PM +0000, Martin Matuska wrote:
The branch main has been updated by mm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=2276e53940c2a2bf7c7e9cb705e51de4202258c2
commit 2276e53940c2a2bf7c7e9cb705e51de4202258c2
Merge: cd201c090858 688514e4704b
Author: Martin Matuska <[email protected]>
AuthorDate: 2023-11-28 20:35:02 +0000
Commit: Martin Matuska <[email protected]>
CommitDate: 2023-11-28 20:35:58 +0000
zfs: merge openzfs/zfs@688514e47
Notable upstream pull request merges:
#15532 c1a47de86 zdb: Fix zdb '-O|-r' options with -e/exported zpool
#15535 cf3316633 ZVOL: Minor code cleanup
#15541 803a9c12c brt: lift internal definitions into _impl header
#15541 213d68296 zdb: show BRT statistics and dump its contents
#15543 a49087510 ZIL: Refactor TX_WRITE encryption similar to
TX_CLONE_RANGE
#15543 27d8c23c5 ZIL: Do not encrypt block pointers in lr_clone_range_t
#15549 67894a597 unnecessary alloc/free in dsl_scan_visitbp()
#15551 126efb588 FreeBSD: Fix the build on FreeBSD 12
#15563 acb33ee1c FreeBSD: Fix ZFS so that snapshots under .zfs/snapshot
are
NFS visible
#15564 7bbd42ef4 Don't allow attach to a raidz child vdev
#15566 688514e47 dmu_buf_will_clone: fix race in transition back to NOFILL
#15571 30d581121 dnode_is_dirty: check dnode and its data for dirtiness
Obtained from: OpenZFS
OpenZFS commit: 688514e4704bdee4551d25960febd322ac26f297
/home/bapt/worktrees/main/sys/contrib/openzfs/cmd/zdb/zdb.c:2129:37: error:
format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka
'unsigned long long') [-Werror,-Wformat]
/home/bapt/worktrees/main/sys/contrib/openzfs/cmd/zdb/zdb.c:2159:44: error:
format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka
'unsigned long long') [-Werror,-Wformat]
Should already be fixed. Warner fixed it in FreeBSD and Martin
upstreamed to OpenZFS: https://github.com/openzfs/zfs/pull/15606
--
Alexander Motin
