]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c816b23 aee26af)
zfs: merge openzfs/zfs@aee26af27 (zfs-2.1-release) into stable/13
authorMartin Matuska <mm@FreeBSD.org>
Sat, 26 Jun 2021 11:37:50 +0000 (13:37 +0200)
committerMartin Matuska <mm@FreeBSD.org>
Sat, 26 Jun 2021 11:38:37 +0000 (13:38 +0200)
commit363a2f5661b3ad079862bee56b86c08648ecc178
tree3a6f4508511e272927dcb2c675496253cd2b0a86tree | snapshot
parentc816b23784a61b5a3222f3db1ce595c06f2c4005commit | diff
parentaee26af277c91abeb0e1cfe27cc48cc328fdb881commit | diff
zfs: merge openzfs/zfs@aee26af27 (zfs-2.1-release) into stable/13

Notable upstream pull request merges:
  #12172 Use wmsum for arc, abd, dbuf and zfetch statistics
  #12227 Revert Consolidate arc_buf allocation checks
  #12273 zfs_metaslab_mem_limit should be 25 instead of 75
  #12266 Fix flag copying in resume case
  #12276 Update cache file when setting compatibility property

Obtained from: OpenZFS
OpenZFS commit: aee26af277c91abeb0e1cfe27cc48cc328fdb881
57 files changed:
sys/contrib/openzfs/.github/ISSUE_TEMPLATE/config.yml diff1 | diff2 | blob | history
sys/contrib/openzfs/cmd/ztest/ztest.c diff1 | diff2 | blob | history
sys/contrib/openzfs/contrib/pam_zfs_key/pam_zfs_key.c diff1 | diff2 | blob | history
sys/contrib/openzfs/include/sys/abd_impl.h diff1 | diff2 | blob | history
sys/contrib/openzfs/include/sys/arc_impl.h diff1 | diff2 | blob | history
sys/contrib/openzfs/include/sys/crypto/api.h diff1 | diff2 | blob | history
sys/contrib/openzfs/include/sys/dnode.h diff1 | diff2 | blob | history
sys/contrib/openzfs/include/sys/zfs_debug.h diff1 | diff2 | blob | history
sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c diff1 | diff2 | blob | history
sys/contrib/openzfs/lib/libzpool/kernel.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_debug.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/os/linux/zfs/abd_os.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/os/linux/zfs/arc_os.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/os/linux/zfs/zfs_debug.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/os/linux/zfs/zio_crypt.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/arc.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/dbuf.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/dmu_objset.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/dmu_recv.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/dmu_tx.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/dmu_zfetch.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/dnode.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/dnode_sync.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/dsl_dataset.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/dsl_destroy.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/dsl_dir.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/metaslab.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/mmp.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/range_tree.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/sa.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/spa.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/spa_checkpoint.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/spa_history.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/spa_misc.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/space_map.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/txg.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/vdev.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/vdev_indirect.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/vdev_removal.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/zap.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/zap_micro.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/zcp.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/zil.c diff1 | diff2 | blob | history
sys/contrib/openzfs/module/zfs/zio.c diff1 | diff2 | blob | history
sys/contrib/openzfs/tests/runfiles/common.run diff1 | diff2 | blob | history
sys/contrib/openzfs/tests/test-runner/bin/zts-report.py.in diff1 | diff2 | blob | history
sys/contrib/openzfs/tests/zfs-tests/include/commands.cfg diff1 | diff2 | blob | history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.am diff1 | diff2 | blob | history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_009_pos.ksh | diff2 | blob | history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/redacted_send/redacted_embedded.ksh diff1 | diff2 | blob | history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/rsend.kshlib diff1 | diff2 | blob | history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send-c_embedded_blocks.ksh diff1 | diff2 | blob | history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send-c_zstreamdump.ksh diff1 | diff2 | blob | history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send-cpL_varied_recsize.ksh diff1 | diff2 | blob | history
sys/modules/zfs/zfs_config.h diff1 | | blob | history
Unnamed repository; edit this file 'description' to name the repository.