Diffusion FreeBSD src repository cbfe997563d2

zfs: merge openzfs/zfs@4647353c8
cbfe997563d2
Actions

Description

zfs: merge openzfs/zfs@4647353c8

Notable upstream pull request merges:
#15240 bbac1d297 Update the behavior of mountpoint property
#15240 c63aabaf1 Improve the handling of sharesmb,sharenfs properties
#15248 741c215ba Fix l2arc_apply_transforms ztest crash
#15274 ee720ad7b Retire z_nr_znodes
#15278 90149552b ZIL: Fix potential race on flush deferring
#15279 e923bcd16 Update the MOS directory on spa_upgrade_errlog()
#15281 529bec7d7 zed: Allow autoreplace and fault LEDs for removed vdevs
#15288 7228ba111 cmd: add 'help' subcommand to zpool and zfs
#15297 4647353c8 status: report pool suspension state under

failmode=continue

Obtained from: OpenZFS
OpenZFS commit: 4647353c8b2b5ca506da45bb9b01e1f3ef521847

Details

Provenance

mm	Authored on Sep 21 2023, 9:25 AM

Parents

rGc0e249d32c78: bsdinstall: avoid conflicts with fd 3
rG4647353c8b2b: status: report pool suspension state under failmode=continue

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rGcbfe997563d2: zfs: merge openzfs/zfs@4647353c8 (authored by mm).Sep 21 2023, 9:27 AM

Merged Changes

4647353c8b2b status: report pool suspension state under failmode=continue
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
6d9bc3ec9f17 Fix occasional rsend test crashes
Author
pcd_delphix.com
Browse Repository
No Builds
No Audits
90149552b1ee ZIL: Fix potential race on flush deferring.
Author
mav
Browse Repository
No Builds
No Audits
5f1479d92f66 Use ASSERT0P() to check that a pointer is NULL.
Author
des
Browse Repository
No Builds
No Audits
506fe78c4843 Add VERIFY0P() and ASSERT0P() macros.
Author
des
Browse Repository
No Builds
No Audits
01d9283af354 Clean up existing VERIFY*() macros.
Author
des
Browse Repository
No Builds
No Audits
c63aabaf1c54 Improve the handling of sharesmb,sharenfs properties
Author
Umer Saleem <usaleem@ixsystems.com>
Browse Repository
No Builds
No Audits
bbac1d2977ec Update the behavior of mountpoint property
Author
Umer Saleem <usaleem@ixsystems.com>
Browse Repository
No Builds
No Audits
7228ba111402 cmd: add 'help' subcommand to zpool and zfs
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
2076011e0c4c Fix incorrect expected error in ztest
Author
pcd_delphix.com
Browse Repository
No Builds
No Audits
741c215bab32 Fix l2arc_apply_transforms ztest crash
Author
pcd_delphix.com
Browse Repository
No Builds
No Audits
6cb933c56ea6 tests: install missing PAM tests
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
e923bcd16c33 Update the MOS directory on spa_upgrade_errlog()
Author
g_amanakis_yahoo.com
Browse Repository
No Builds
No Audits
ee720ad7bca8 Retire z_nr_znodes
Author
mjg
Browse Repository
No Builds
No Audits
529bec7d7ba7 zed: Allow autoreplace and fault LEDs for removed vdevs
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
9192ab7777fb check-zstd-symbols: also ignore __pfx_ symbols
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
8af8d2abb1ee Linux 6.5 compat: META (#15265)
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
4d1b70175cf9 Remove implication that child `disk`s aren't vdevs in zpoolconcepts(7)
Author
Laura Hild <lsh@jlab.org>
Browse Repository
No Builds
No Audits

Changes (34)

Path

Size

sys/

contrib/

openzfs/

zfs: merge openzfs/zfs@4647353c8cbfe997563d2Actions

Description

Details

Event Timeline

Merged Changes

Changes (34)

rGcbfe997563d2

sys/contrib/openzfs/META

sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c

sys/contrib/openzfs/cmd/zed/zed.d/statechange-led.sh

sys/contrib/openzfs/cmd/zfs/zfs_main.c

sys/contrib/openzfs/cmd/zpool/zpool_main.c

sys/contrib/openzfs/cmd/ztest.c

sys/contrib/openzfs/include/os/freebsd/spl/sys/debug.h

sys/contrib/openzfs/include/os/linux/spl/sys/debug.h

sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_vfsops_os.h

sys/contrib/openzfs/lib/libshare/os/freebsd/nfs.c

sys/contrib/openzfs/lib/libshare/os/linux/nfs.c

sys/contrib/openzfs/lib/libspl/include/assert.h

sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c

sys/contrib/openzfs/lib/libzfs/libzfs_pool.c

sys/contrib/openzfs/lib/libzfs_core/libzfs_core.c

sys/contrib/openzfs/man/man7/zpoolconcepts.7

sys/contrib/openzfs/module/Makefile.in

sys/contrib/openzfs/module/os/linux/zfs/zfs_ctldir.c

sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c

sys/contrib/openzfs/module/os/linux/zfs/zfs_znode.c

sys/contrib/openzfs/module/zfs/arc.c

sys/contrib/openzfs/module/zfs/dbuf.c

sys/contrib/openzfs/module/zfs/spa_errlog.c

sys/contrib/openzfs/module/zfs/spa_misc.c

sys/contrib/openzfs/module/zfs/zil.c

sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_006_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_008_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_012_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_002_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_003_neg.ksh

sys/modules/zfs/zfs_config.h

sys/modules/zfs/zfs_gitrev.h

zfs: merge openzfs/zfs@4647353c8
cbfe997563d2
Actions