]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
zfs: merge openzfs/zfs@c3b60eded (zfs-2.1-release) into stable/13
authorMartin Matuska <mm@FreeBSD.org>
Sun, 13 Jun 2021 02:47:27 +0000 (04:47 +0200)
committerMartin Matuska <mm@FreeBSD.org>
Sun, 13 Jun 2021 03:43:03 +0000 (05:43 +0200)
commitb0c251b0dea8ab1476e42aa49a888b0d969020d2
treec9f813235816a7855d5840938c1d5760f7b2a33d
parentcfd6c9b99f49dd24860456742eecccabfc100326
parentc3b60ededa6e6ce36a457a54451ca153c4c630dc
zfs: merge openzfs/zfs@c3b60eded (zfs-2.1-release) into stable/13

Notable upstream pull request merges:
  #12015 Replace zstreamdump with zstream link
  #12046 Improve scrub maxinflight_bytes math.
  #12052 FreeBSD: incorporate changes to the VFS_QUOTACTL(9) KPI
  #12072 Let zfs diff be more permissive
  #12091 libzfs: On FreeBSD, use MNT_NOWAIT with getfsstat
  #12104 Reminder to update boot code after zpool upgrade
  #12114 Introduce write-mostly sums
  #12125 Modernise all (most) remaining .TH manpages
  #12145 More aggsum optimizations
  #12149 Multiple man-pages: Move to appropriate section
  #12158 Re-embed multilist_t storage
  #12177 Livelist logic should handle dedup blkptrs
  #12196 Unify manpage makefiles, move pages to better sexions, revisit some
  #12212 Remove pool io kstats

Obtained from: OpenZFS
OpenZFS commit: c3b60ededa6e6ce36a457a54451ca153c4c630dc
OpenZFS tag: zfs-2.1.0-rc7
238 files changed:
ObsoleteFiles.inc
cddl/sbin/zfs/Makefile
cddl/sbin/zpool/Makefile
cddl/usr.bin/Makefile
cddl/usr.bin/zstream/Makefile
sys/contrib/openzfs/.github/ISSUE_TEMPLATE/config.yml
sys/contrib/openzfs/META
sys/contrib/openzfs/Makefile.am
sys/contrib/openzfs/cmd/Makefile.am
sys/contrib/openzfs/cmd/arc_summary/arc_summary3
sys/contrib/openzfs/cmd/fsck_zfs/Makefile.am
sys/contrib/openzfs/cmd/fsck_zfs/fsck.zfs.in
sys/contrib/openzfs/cmd/vdev_id/Makefile.am
sys/contrib/openzfs/cmd/zdb/zdb.c
sys/contrib/openzfs/cmd/zed/Makefile.am
sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am
sys/contrib/openzfs/cmd/zed/zed.d/all-debug.sh
sys/contrib/openzfs/cmd/zed/zed.d/all-syslog.sh
sys/contrib/openzfs/cmd/zed/zed.d/history_event-zfs-list-cacher.sh.in
sys/contrib/openzfs/cmd/zed/zed.d/zed-functions.sh
sys/contrib/openzfs/cmd/zfs/zfs_main.c
sys/contrib/openzfs/cmd/zgenhostid/zgenhostid.c
sys/contrib/openzfs/cmd/zpool/Makefile.am
sys/contrib/openzfs/cmd/zpool/os/freebsd/zpool_vdev_os.c
sys/contrib/openzfs/cmd/zpool/os/linux/zpool_vdev_os.c
sys/contrib/openzfs/cmd/zpool/zpool.d/smart
sys/contrib/openzfs/cmd/zpool/zpool_main.c
sys/contrib/openzfs/cmd/zpool/zpool_util.h
sys/contrib/openzfs/cmd/zpool_influxdb/dashboards/grafana/ZFS-pool-latency-heatmaps-influxdb.json
sys/contrib/openzfs/cmd/zstream/Makefile.am
sys/contrib/openzfs/cmd/zstream/zstream.c
sys/contrib/openzfs/cmd/ztest/ztest.c
sys/contrib/openzfs/cmd/zvol_wait/Makefile.am
sys/contrib/openzfs/cmd/zvol_wait/zvol_wait
sys/contrib/openzfs/config/Shellcheck.am
sys/contrib/openzfs/config/always-shellcheck.m4
sys/contrib/openzfs/config/ax_python_devel.m4
sys/contrib/openzfs/config/kernel-percpu.m4
sys/contrib/openzfs/config/zfs-build.m4
sys/contrib/openzfs/configure.ac
sys/contrib/openzfs/contrib/Makefile.am
sys/contrib/openzfs/contrib/bash_completion.d/Makefile.am
sys/contrib/openzfs/contrib/bash_completion.d/zfs.in
sys/contrib/openzfs/contrib/bpftrace/Makefile.am
sys/contrib/openzfs/contrib/dracut/02zfsexpandknowledge/Makefile.am
sys/contrib/openzfs/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in
sys/contrib/openzfs/contrib/dracut/90zfs/.gitignore
sys/contrib/openzfs/contrib/dracut/90zfs/Makefile.am
sys/contrib/openzfs/contrib/dracut/90zfs/import-opts-generator.sh.in
sys/contrib/openzfs/contrib/dracut/90zfs/module-setup.sh.in
sys/contrib/openzfs/contrib/dracut/90zfs/mount-zfs.sh.in
sys/contrib/openzfs/contrib/dracut/90zfs/parse-zfs.sh.in
sys/contrib/openzfs/contrib/dracut/90zfs/zfs-generator.sh.in
sys/contrib/openzfs/contrib/dracut/90zfs/zfs-lib.sh.in
sys/contrib/openzfs/contrib/dracut/90zfs/zfs-load-key.sh.in
sys/contrib/openzfs/contrib/dracut/Makefile.am
sys/contrib/openzfs/contrib/initramfs/Makefile.am
sys/contrib/openzfs/contrib/initramfs/hooks/Makefile.am
sys/contrib/openzfs/contrib/initramfs/hooks/zfs.in
sys/contrib/openzfs/contrib/initramfs/hooks/zfsunlock.in
sys/contrib/openzfs/contrib/initramfs/scripts/Makefile.am
sys/contrib/openzfs/contrib/initramfs/scripts/local-top/Makefile.am
sys/contrib/openzfs/contrib/initramfs/scripts/local-top/zfs
sys/contrib/openzfs/contrib/initramfs/scripts/zfs
sys/contrib/openzfs/etc/Makefile.am
sys/contrib/openzfs/etc/default/Makefile.am
sys/contrib/openzfs/etc/init.d/Makefile.am
sys/contrib/openzfs/etc/init.d/zfs-import.in
sys/contrib/openzfs/etc/init.d/zfs-mount.in
sys/contrib/openzfs/etc/init.d/zfs-share.in
sys/contrib/openzfs/etc/init.d/zfs-zed.in
sys/contrib/openzfs/etc/systemd/Makefile.am
sys/contrib/openzfs/etc/systemd/system-generators/Makefile.am
sys/contrib/openzfs/etc/systemd/system-generators/zfs-mount-generator.c
sys/contrib/openzfs/etc/systemd/system/zfs-import-cache.service.in
sys/contrib/openzfs/etc/systemd/system/zfs-import-scan.service.in
sys/contrib/openzfs/etc/zfs/Makefile.am
sys/contrib/openzfs/etc/zfs/zfs-functions.in
sys/contrib/openzfs/include/os/freebsd/spl/sys/Makefile.am
sys/contrib/openzfs/include/os/freebsd/spl/sys/kstat.h
sys/contrib/openzfs/include/os/freebsd/spl/sys/wmsum.h
sys/contrib/openzfs/include/os/linux/spl/sys/Makefile.am
sys/contrib/openzfs/include/os/linux/spl/sys/atomic.h
sys/contrib/openzfs/include/os/linux/spl/sys/kstat.h
sys/contrib/openzfs/include/os/linux/spl/sys/wmsum.h
sys/contrib/openzfs/include/sys/aggsum.h
sys/contrib/openzfs/include/sys/arc_impl.h
sys/contrib/openzfs/include/sys/dataset_kstats.h
sys/contrib/openzfs/include/sys/dmu_objset.h
sys/contrib/openzfs/include/sys/metaslab_impl.h
sys/contrib/openzfs/include/sys/multilist.h
sys/contrib/openzfs/include/sys/spa.h
sys/contrib/openzfs/include/sys/zfs_context.h
sys/contrib/openzfs/include/sys/zfs_ioctl_impl.h
sys/contrib/openzfs/lib/libnvpair/libnvpair_json.c
sys/contrib/openzfs/lib/libspl/asm-generic/atomic.c
sys/contrib/openzfs/lib/libspl/include/atomic.h
sys/contrib/openzfs/lib/libspl/include/sys/Makefile.am
sys/contrib/openzfs/lib/libspl/include/sys/kstat.h
sys/contrib/openzfs/lib/libspl/include/sys/wmsum.h
sys/contrib/openzfs/lib/libspl/os/freebsd/mnttab.c
sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c
sys/contrib/openzfs/lib/libzfs/libzfs_diff.c
sys/contrib/openzfs/lib/libzfs/libzfs_mount.c
sys/contrib/openzfs/lib/libzfs/libzfs_pool.c
sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c
sys/contrib/openzfs/lib/libzfs/libzfs_util.c
sys/contrib/openzfs/lib/libzpool/kernel.c
sys/contrib/openzfs/man/Makefile.am
sys/contrib/openzfs/man/man1/arcstat.1
sys/contrib/openzfs/man/man1/cstyle.1
sys/contrib/openzfs/man/man1/raidz_test.1
sys/contrib/openzfs/man/man1/zhack.1
sys/contrib/openzfs/man/man1/ztest.1
sys/contrib/openzfs/man/man1/zvol_wait.1
sys/contrib/openzfs/man/man4/spl.4
sys/contrib/openzfs/man/man4/zfs.4
sys/contrib/openzfs/man/man5/vdev_id.conf.5
sys/contrib/openzfs/man/man7/zfsconcepts.7
sys/contrib/openzfs/man/man7/zfsprops.7
sys/contrib/openzfs/man/man7/zpool-features.7
sys/contrib/openzfs/man/man7/zpoolconcepts.7
sys/contrib/openzfs/man/man7/zpoolprops.7
sys/contrib/openzfs/man/man8/fsck.zfs.8
sys/contrib/openzfs/man/man8/mount.zfs.8
sys/contrib/openzfs/man/man8/vdev_id.8
sys/contrib/openzfs/man/man8/zdb.8
sys/contrib/openzfs/man/man8/zed.8.in
sys/contrib/openzfs/man/man8/zfs-allow.8
sys/contrib/openzfs/man/man8/zfs-bookmark.8
sys/contrib/openzfs/man/man8/zfs-clone.8
sys/contrib/openzfs/man/man8/zfs-create.8
sys/contrib/openzfs/man/man8/zfs-destroy.8
sys/contrib/openzfs/man/man8/zfs-diff.8
sys/contrib/openzfs/man/man8/zfs-hold.8
sys/contrib/openzfs/man/man8/zfs-jail.8
sys/contrib/openzfs/man/man8/zfs-list.8
sys/contrib/openzfs/man/man8/zfs-load-key.8
sys/contrib/openzfs/man/man8/zfs-mount-generator.8.in
sys/contrib/openzfs/man/man8/zfs-mount.8
sys/contrib/openzfs/man/man8/zfs-program.8
sys/contrib/openzfs/man/man8/zfs-project.8
sys/contrib/openzfs/man/man8/zfs-promote.8
sys/contrib/openzfs/man/man8/zfs-receive.8
sys/contrib/openzfs/man/man8/zfs-rename.8
sys/contrib/openzfs/man/man8/zfs-rollback.8
sys/contrib/openzfs/man/man8/zfs-send.8
sys/contrib/openzfs/man/man8/zfs-set.8
sys/contrib/openzfs/man/man8/zfs-share.8
sys/contrib/openzfs/man/man8/zfs-snapshot.8
sys/contrib/openzfs/man/man8/zfs-upgrade.8
sys/contrib/openzfs/man/man8/zfs-userspace.8
sys/contrib/openzfs/man/man8/zfs-wait.8
sys/contrib/openzfs/man/man8/zfs.8
sys/contrib/openzfs/man/man8/zfs_ids_to_path.8
sys/contrib/openzfs/man/man8/zgenhostid.8
sys/contrib/openzfs/man/man8/zinject.8
sys/contrib/openzfs/man/man8/zpool-add.8
sys/contrib/openzfs/man/man8/zpool-attach.8
sys/contrib/openzfs/man/man8/zpool-checkpoint.8
sys/contrib/openzfs/man/man8/zpool-clear.8
sys/contrib/openzfs/man/man8/zpool-create.8
sys/contrib/openzfs/man/man8/zpool-destroy.8
sys/contrib/openzfs/man/man8/zpool-detach.8
sys/contrib/openzfs/man/man8/zpool-events.8
sys/contrib/openzfs/man/man8/zpool-export.8
sys/contrib/openzfs/man/man8/zpool-get.8
sys/contrib/openzfs/man/man8/zpool-history.8
sys/contrib/openzfs/man/man8/zpool-import.8
sys/contrib/openzfs/man/man8/zpool-initialize.8
sys/contrib/openzfs/man/man8/zpool-iostat.8
sys/contrib/openzfs/man/man8/zpool-labelclear.8
sys/contrib/openzfs/man/man8/zpool-list.8
sys/contrib/openzfs/man/man8/zpool-offline.8
sys/contrib/openzfs/man/man8/zpool-reguid.8
sys/contrib/openzfs/man/man8/zpool-remove.8
sys/contrib/openzfs/man/man8/zpool-reopen.8
sys/contrib/openzfs/man/man8/zpool-replace.8
sys/contrib/openzfs/man/man8/zpool-resilver.8
sys/contrib/openzfs/man/man8/zpool-scrub.8
sys/contrib/openzfs/man/man8/zpool-split.8
sys/contrib/openzfs/man/man8/zpool-status.8
sys/contrib/openzfs/man/man8/zpool-sync.8
sys/contrib/openzfs/man/man8/zpool-trim.8
sys/contrib/openzfs/man/man8/zpool-upgrade.8
sys/contrib/openzfs/man/man8/zpool-wait.8
sys/contrib/openzfs/man/man8/zpool.8
sys/contrib/openzfs/man/man8/zpool_influxdb.8
sys/contrib/openzfs/man/man8/zstream.8
sys/contrib/openzfs/man/man8/zstreamdump.8
sys/contrib/openzfs/module/os/freebsd/spl/spl_kstat.c
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
sys/contrib/openzfs/module/os/linux/spl/spl-kmem-cache.c
sys/contrib/openzfs/module/os/linux/spl/spl-kstat.c
sys/contrib/openzfs/module/os/linux/zfs/zfs_ioctl_os.c
sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c
sys/contrib/openzfs/module/zfs/aggsum.c
sys/contrib/openzfs/module/zfs/arc.c
sys/contrib/openzfs/module/zfs/dataset_kstats.c
sys/contrib/openzfs/module/zfs/dbuf.c
sys/contrib/openzfs/module/zfs/dmu_objset.c
sys/contrib/openzfs/module/zfs/dnode.c
sys/contrib/openzfs/module/zfs/dsl_dataset.c
sys/contrib/openzfs/module/zfs/dsl_deadlist.c
sys/contrib/openzfs/module/zfs/dsl_pool.c
sys/contrib/openzfs/module/zfs/dsl_scan.c
sys/contrib/openzfs/module/zfs/metaslab.c
sys/contrib/openzfs/module/zfs/multilist.c
sys/contrib/openzfs/module/zfs/spa_stats.c
sys/contrib/openzfs/module/zfs/vdev_queue.c
sys/contrib/openzfs/module/zfs/zfs_ioctl.c
sys/contrib/openzfs/rpm/generic/zfs.spec.in
sys/contrib/openzfs/scripts/Makefile.am
sys/contrib/openzfs/scripts/commitcheck.sh
sys/contrib/openzfs/scripts/dkms.mkconf
sys/contrib/openzfs/scripts/dkms.postbuild
sys/contrib/openzfs/scripts/kmodtool
sys/contrib/openzfs/scripts/make_gitrev.sh
sys/contrib/openzfs/scripts/man-dates.sh
sys/contrib/openzfs/scripts/mancheck.sh
sys/contrib/openzfs/scripts/paxcheck.sh
sys/contrib/openzfs/scripts/zfs-tests.sh
sys/contrib/openzfs/scripts/zfs.sh
sys/contrib/openzfs/scripts/zimport.sh
sys/contrib/openzfs/scripts/zloop.sh
sys/contrib/openzfs/scripts/zol2zfs-patch.sed
sys/contrib/openzfs/tests/Makefile.am
sys/contrib/openzfs/tests/runfiles/common.run
sys/contrib/openzfs/tests/test-runner/man/test-runner.1
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_checksum.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_objset_id.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_dedup.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events_duplicates.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/l2arc_mfuonly_pos.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/perf/scripts/prefetch_io.sh
sys/contrib/openzfs/udev/rules.d/.gitignore
sys/modules/zfs/zfs_config.h