Diffusion FreeBSD src repository e3aa18ad7178

zfs: merge openzfs/zfs@b9d98453f
e3aa18ad7178
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

zfs: merge openzfs/zfs@b9d98453f

Notable upstream pull request merges:

#12321 Fix inflated quiesce time caused by lwb_tx during zil_commit()
#13244 zstd early abort
#13360 Verify BPs as part of spa_load_verify_cb()
#13452 More speculative prefetcher improvements
#13466 Expose zpool guids through kstats
#13476 Refactor Log Size Limit
#13484 FreeBSD: libspl: Add locking around statfs globals
#13498 Cancel in-progress rebuilds when we finish removal
#13499 zed: Take no action on scrub/resilver checksum errors
#13513 Remove wrong assertion in log spacemap

Obtained from: OpenZFS
OpenZFS commit: b9d98453f9387c413f91d1d9cdb0cba8e04dbd95

Details

Provenance

mm	Authored on Jun 3 2022, 3:58 PM

Parents

rG645886d028c8: iwlwifi: add sysctl to dump PCI IDs/ names / firmware-prefixes
rGb9d98453f938: autoconf: AC_MSG_CHECKING consistency

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rGe3aa18ad7178: zfs: merge openzfs/zfs@b9d98453f (authored by mm).Jun 3 2022, 4:17 PM

Merged Changes

b9d98453f938 autoconf: AC_MSG_CHECKING consistency
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
4c6526208db0 Linux 5.19 compat: asm/fpu/internal.h
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
42cf2ad0e4e2 Remove wrong assertion in log spacemap
Author
mav
Browse Repository
No Builds
No Audits
bc8192cd5b14 Corrected parameters for zstd early abort
Author
rincebrain_gmail.com
Browse Repository
No Builds
No Audits
2310dba9ebf6 Fix typo in zil_commit() comment block
Author
allanjude
Browse Repository
No Builds
No Audits
a70e613070a8 Linux 5.18 compat: META
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
91350681b8c8 Linux 5.19 compat: zap_flags_t conflict
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
d41e864181e4 Linux 5.19 compat: bdev_start_io_acct() / bdev_end_io_acct()
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
c2c2e7bb8b7c Linux 5.19 compat: aops->read_folio()
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
a12a5cb5b821 Linux 5.19 compat: blkdev_issue_secure_erase()
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
e2c31f2bc7d1 Linux 5.19 compat: bdev_max_secure_erase_sectors()
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
5e4aedaca7ce Linux 5.19 compat: bdev_max_discard_sectors()
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
5f264996f4dc Linux 5.18 compat: bio_alloc()
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
152d6fda54e6 Fix inflated quiesce time caused by lwb_tx during zil_commit()
Author
Kevin Jin <33590050+jxdking@users.noreply.github.com>
Browse Repository
No Builds
No Audits
d98a67a53a18 Replace EXTRA_DIST with dist_noinst_DATA
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
b62829295e95 Silence unused-but-set-variable warning
Author
freqlabs
Browse Repository
No Builds
No Audits
6aa8c21a2ad2 More speculative prefetcher improvements
Author
mav
Browse Repository
No Builds
No Audits
1d89b989c15a automake: don't install /e/d/zfs or /e/z/zfs-functions +x
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
7829b465a7f7 Cancel in-progress rebuilds when we finish removal
Author
pcd_delphix.com
Browse Repository
No Builds
No Audits
b37093a188d9 rpm: Keep debug symbols if configured with '--enable-debuginfo'
Author
Umer Saleem <usaleem@ixsystems.com>
Browse Repository
No Builds
No Audits
61ef68727b0b Standardize RHEL version check in packages
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
3bbc26097e53 Unbreak zstd build on sparc64
Author
rincebrain_gmail.com
Browse Repository
No Builds
No Audits
82aa4f6f8585 Switch sed -E to -r for better portability
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
4dc1c8a0b846 rpm: Use the correct version-release information in dependencies
Author
Neal Gompa (ニール・ゴンパ) <ngompa@datto.com>
Browse Repository
No Builds
No Audits
84d0a03f3e38 Refactor Log Size Limit
Author
mav
Browse Repository
No Builds
No Audits
f375b23c026a Tiered early abort, zstd edition
Author
rincebrain_gmail.com
Browse Repository
No Builds
No Audits
2e0576500691 FreeBSD: libspl: Add locking around statfs globals
Author
freqlabs
Browse Repository
No Builds
No Audits
3c356622994f Modified ncompress requirement in RPM to exclude RHEL9
Author
rincebrain_gmail.com
Browse Repository
No Builds
No Audits
cf70c0f8ae01 zed: Take no action on scrub/resilver checksum errors
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
2cd0f98f4aae Verify BPs in spa_load_verify_cb() and dsl_scan_visitbp()
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
03df6bad9450 zdb: Fix handling of nul termination in symlink targets
Author
markj
Browse Repository
No Builds
No Audits
e02d84d3a515 linux: libshare: smb: don't swallow net(1) errors
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
2b4f2fc93c42 libzfs: return (allocated) strings instead of filling buffers
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
38f4d99f769e linux: libzfs: simplify module-loaded check
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
89e81bc6adf5 Remove final K&R definitions
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
6b575417e2bd libspl/include: remove unused/empty headers
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
2f713390d18f kmodtool: cleanup
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
7062a956f79b rpm: don't spec obsolete_name/version anymore
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
7506f5af9228 Add make regen-tests to regenerate the test bundle
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
08b32c6fa9dd zed: support subject as header in zed_notify_email()
Author
heeplr <32984777+heeplr@users.noreply.github.com>
Browse Repository
No Builds
No Audits
00ac77464ef1 Expose zpool guids through kstats
Author
andrew
Browse Repository
No Builds
No Audits

Changes (121)

Path

Size

cddl/

usr.sbin/

zfsd/

Makefile.common

stand/

libsa/

zfs/

sys/

contrib/

openzfs/

.github/

workflows/

zfs-tests-functional.yml

zfs-tests-sanity.yml

cmd/

zdb/

zed/

agents/

zfs_diagnosis.c

zed.d/

zed-functions.sh

zed_disk_event.c

zfs/

zpool/

config/

kernel-blk-queue.m4

kernel-blkdev.m4

kernel-generic_io_acct.m4

kernel-pagemap-folio_wait_bit.m4

kernel-readpages.m4

kernel-shrink.m4

kernel-sysfs.m4

kernel-vfs-filemap_dirty_folio.m4

kernel-vfs-iov_iter.m4

kernel-vfs-read_folio.m4

kernel-vfs-set_page_dirty.m4

contrib/

bpftrace/

dracut/

initramfs/

pyzfs/

zcp/

etc/

include/

os/

linux/

kernel/

linux/

blkdev_compat.h

sys/

fs/

zstd/

lib/

libnvpair/

libshare/

os/

linux/

libspl/

include/

os/

freebsd/

sys/

zfs_context_os.h

linux/

sys/

sys/

os/

freebsd/

libuutil/

libzfs/

libzfs_dataset.c

os/

freebsd/

libzfs_compat.c

linux/

libzfs_util_os.c

libzfs_core/

libzfsbootenv/

man/

man4/

man8/

module/

os/

linux/

zfs/

zfs/

spa_log_spacemap.c

zstd/

rpm/

generic/

zfs-dkms.spec.in

zfs-kmod.spec.in

redhat/

zfs-kmod.spec.in

scripts/

tests/

zfs-tests/

cmd/

tests/

modules/

zfs/

rGe3aa18ad7178

cddl/usr.sbin/zfsd/Makefile.common

Loading...

stand/libsa/zfs/Makefile.inc

Loading...

sys/contrib/openzfs/.github/workflows/zfs-tests-functional.yml

Loading...

sys/contrib/openzfs/.github/workflows/zfs-tests-sanity.yml

Loading...

sys/contrib/openzfs/.github/workflows/zloop.yml

Loading...

sys/contrib/openzfs/META

Loading...

sys/contrib/openzfs/Makefile.am

Loading...

sys/contrib/openzfs/cmd/Makefile.am

Loading...

sys/contrib/openzfs/cmd/zdb/zdb.c

Loading...

sys/contrib/openzfs/cmd/zed/Makefile.am

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am

Loading...

sys/contrib/openzfs/cmd/zed/zed.d/zed-functions.sh

Loading...

sys/contrib/openzfs/cmd/zed/zed.d/zed.rc

Loading...

sys/contrib/openzfs/cmd/zed/zed_disk_event.c

Loading...

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

Loading...

sys/contrib/openzfs/cmd/zpool/Makefile.am

Loading...

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

Loading...

sys/contrib/openzfs/config/Substfiles.am

Loading...

sys/contrib/openzfs/config/kernel-bio.m4

Loading...

sys/contrib/openzfs/config/kernel-blk-queue.m4

Loading...

sys/contrib/openzfs/config/kernel-blkdev.m4

Loading...

sys/contrib/openzfs/config/kernel-fpu.m4

Loading...

sys/contrib/openzfs/config/kernel-generic_io_acct.m4

Loading...

sys/contrib/openzfs/config/kernel-pagemap-folio_wait_bit.m4

Loading...

sys/contrib/openzfs/config/kernel-readpages.m4

Loading...

sys/contrib/openzfs/config/kernel-shrink.m4

Loading...

sys/contrib/openzfs/config/kernel-sysfs.m4

Loading...

sys/contrib/openzfs/config/kernel-vfs-filemap_dirty_folio.m4

Loading...

sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4

Loading...

sys/contrib/openzfs/config/kernel-vfs-read_folio.m4

Loading...

sys/contrib/openzfs/config/kernel-vfs-set_page_dirty.m4

Loading...

sys/contrib/openzfs/config/kernel.m4

Loading...

sys/contrib/openzfs/config/zfs-build.m4

Loading...

sys/contrib/openzfs/configure.ac

Loading...

sys/contrib/openzfs/contrib/bpftrace/Makefile.am

Loading...

sys/contrib/openzfs/contrib/dracut/Makefile.am

Loading...

sys/contrib/openzfs/contrib/initramfs/Makefile.am

Loading...

sys/contrib/openzfs/contrib/pyzfs/Makefile.am

Loading...

sys/contrib/openzfs/contrib/zcp/Makefile.am

Loading...

sys/contrib/openzfs/etc/Makefile.am

Loading...

sys/contrib/openzfs/include/libzfs.h

Loading...

sys/contrib/openzfs/include/os/linux/kernel/linux/blkdev_compat.h

Loading...

sys/contrib/openzfs/include/os/linux/kernel/linux/simd_x86.h

Loading...

sys/contrib/openzfs/include/sys/dbuf.h

Loading...

sys/contrib/openzfs/include/sys/dmu_tx.h

Loading...

sys/contrib/openzfs/include/sys/dmu_zfetch.h

Loading...

sys/contrib/openzfs/include/sys/dnode.h

Loading...

sys/contrib/openzfs/include/sys/dsl_pool.h

Loading...

sys/contrib/openzfs/include/sys/fs/zfs.h

Loading...

sys/contrib/openzfs/include/sys/spa.h

Loading...

sys/contrib/openzfs/include/sys/zap.h

Loading...

sys/contrib/openzfs/include/sys/zil_impl.h

Loading...

sys/contrib/openzfs/include/sys/zstd/zstd.h

Loading...

sys/contrib/openzfs/include/thread_pool.h

Loading...

sys/contrib/openzfs/lib/libnvpair/Makefile.am

Loading...

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

Loading...

sys/contrib/openzfs/lib/libspl/include/Makefile.am

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/byteorder.h

Loading...

sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/mnttab.h

Loading...

sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/zfs_context_os.h

Loading...

sys/contrib/openzfs/lib/libspl/include/os/linux/sys/byteorder.h

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/lib/libspl/os/freebsd/mnttab.c

Loading...

sys/contrib/openzfs/lib/libuutil/Makefile.am

Loading...

sys/contrib/openzfs/lib/libzfs/Makefile.am

Loading...

sys/contrib/openzfs/lib/libzfs/libzfs.abi

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c

Loading...

sys/contrib/openzfs/lib/libzfs/os/linux/libzfs_util_os.c

Loading...

sys/contrib/openzfs/lib/libzfs_core/Makefile.am

Loading...

sys/contrib/openzfs/lib/libzfsbootenv/Makefile.am

Loading...

sys/contrib/openzfs/man/Makefile.am

Loading...

sys/contrib/openzfs/man/man4/zfs.4

Loading...

sys/contrib/openzfs/man/man8/zfs.8

Loading...

sys/contrib/openzfs/man/man8/zpool.8

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/module/zstd/zfs_zstd.c

Loading...

sys/contrib/openzfs/rpm/Makefile.am

Loading...

sys/contrib/openzfs/rpm/generic/zfs-dkms.spec.in

Loading...

sys/contrib/openzfs/rpm/generic/zfs-kmod.spec.in

Loading...

sys/contrib/openzfs/rpm/generic/zfs.spec.in

Loading...

sys/contrib/openzfs/rpm/redhat/zfs-kmod.spec.in

Loading...

sys/contrib/openzfs/scripts/Makefile.am

Loading...

sys/contrib/openzfs/scripts/kmodtool

Loading...

sys/contrib/openzfs/tests/Makefile.am

Loading...

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

Loading...

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

Loading...

sys/modules/zfs/zfs_config.h

Loading...

sys/modules/zfs/zfs_gitrev.h

Loading...