Date: Thu, 18 Feb 2021 14:20:09 GMT From: Martin Matuska <mm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ee36e25a86cb - main - zfs: merge OpenZFS master-bf156c966 Message-ID: <202102181420.11IEK9KJ047278@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=ee36e25a86cbe2a9474c1d61f2c4b450da8ef952 commit ee36e25a86cbe2a9474c1d61f2c4b450da8ef952 Merge: fa2528ac6435 62ceb3c592a5 Author: Martin Matuska <mm@FreeBSD.org> AuthorDate: 2021-02-18 14:17:31 +0000 Commit: Martin Matuska <mm@FreeBSD.org> CommitDate: 2021-02-18 14:19:35 +0000 zfs: merge OpenZFS master-bf156c966 Notable upstream changes: bf156c966 Remove unused abd_alloc_scatter_offset_chunkcnt 658fb8020 Add "compatibility" property for zpool feature sets This update introduces a new pool property called "compatibility" that can be used to enable a limited set of pool features on pool creation and "stick" to it, so the "zpool upgrade" does not accidentally enable features that are not desired. The value of this property may then be changed later. See zpool-features(5) for more information about the "compatibility" pool property. Obtained from: OpenZFS MFC after: 2 weeks sys/contrib/openzfs/cmd/zpool/Makefile.am | 47 +- .../openzfs/cmd/zpool/compatibility.d/compat-2018 | 12 + .../openzfs/cmd/zpool/compatibility.d/compat-2019 | 15 + .../openzfs/cmd/zpool/compatibility.d/compat-2020 | 15 + .../openzfs/cmd/zpool/compatibility.d/compat-2021 | 19 + .../openzfs/cmd/zpool/compatibility.d/freebsd-11.0 | 15 + .../openzfs/cmd/zpool/compatibility.d/freebsd-11.2 | 18 + .../openzfs/cmd/zpool/compatibility.d/freebsd-11.3 | 19 + .../cmd/zpool/compatibility.d/freenas-9.10.2 | 13 + .../openzfs/cmd/zpool/compatibility.d/grub2 | 12 + .../cmd/zpool/compatibility.d/openzfs-2.0-freebsd | 33 + .../cmd/zpool/compatibility.d/openzfs-2.0-linux | 34 + .../cmd/zpool/compatibility.d/openzfsonosx-1.7.0 | 16 + .../cmd/zpool/compatibility.d/openzfsonosx-1.8.1 | 21 + .../cmd/zpool/compatibility.d/openzfsonosx-1.9.3 | 27 + .../openzfs/cmd/zpool/compatibility.d/zol-0.6.5 | 12 + .../openzfs/cmd/zpool/compatibility.d/zol-0.7 | 18 + .../openzfs/cmd/zpool/compatibility.d/zol-0.8 | 27 + sys/contrib/openzfs/cmd/zpool/zpool_main.c | 165 +- sys/contrib/openzfs/cmd/ztest/ztest.c | 4 +- sys/contrib/openzfs/config/Rules.am | 1 + sys/contrib/openzfs/include/libzfs.h | 16 + sys/contrib/openzfs/include/sys/fs/zfs.h | 19 +- sys/contrib/openzfs/include/sys/spa_impl.h | 2 + sys/contrib/openzfs/include/zfeature_common.h | 2 - sys/contrib/openzfs/lib/libzfs/libzfs.abi | 6933 ++++++++++++-------- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 228 + sys/contrib/openzfs/lib/libzfs/libzfs_status.c | 29 +- sys/contrib/openzfs/lib/libzutil/zutil_import.c | 10 + sys/contrib/openzfs/man/man5/zpool-features.5 | 59 +- sys/contrib/openzfs/man/man8/zpool-create.8 | 16 +- sys/contrib/openzfs/man/man8/zpool-upgrade.8 | 16 +- sys/contrib/openzfs/man/man8/zpoolprops.8 | 19 + sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c | 19 - .../openzfs/module/zcommon/zfeature_common.c | 13 +- sys/contrib/openzfs/module/zcommon/zpool_prop.c | 4 + sys/contrib/openzfs/module/zfs/spa.c | 30 + sys/contrib/openzfs/module/zfs/spa_config.c | 4 + sys/contrib/openzfs/rpm/generic/zfs.spec.in | 6 +- sys/contrib/openzfs/scripts/Makefile.am | 1 + sys/contrib/openzfs/tests/runfiles/common.run | 8 +- .../tests/zfs-tests/cmd/xattrtest/xattrtest.c | 6 +- .../openzfs/tests/zfs-tests/include/default.cfg.in | 1 + .../functional/cli_root/zpool_create/Makefile.am | 3 + .../cli_root/zpool_create/zpool_create.shlib | 81 + .../zpool_create/zpool_create_features_006_pos.ksh | 58 + .../zpool_create/zpool_create_features_007_pos.ksh | 54 + .../zpool_create/zpool_create_features_008_pos.ksh | 54 + .../functional/cli_root/zpool_get/zpool_get.cfg | 1 + .../functional/cli_root/zpool_status/Makefile.am | 3 +- .../zpool_status/zpool_status_features_001_pos.ksh | 63 + .../functional/cli_root/zpool_upgrade/Makefile.am | 3 +- .../zpool_upgrade_features_001_pos.ksh | 67 + 53 files changed, 5513 insertions(+), 2858 deletions(-) diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2018 index 000000000000,7be44e1eee95..7be44e1eee95 mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2018 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2018 diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2019 index 000000000000,c105cc70c290..c105cc70c290 mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2019 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2019 diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2020 index 000000000000,8d46a571e6ef..8d46a571e6ef mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2020 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2020 diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2021 index 000000000000,f45c82d6560f..f45c82d6560f mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2021 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2021 diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/freebsd-11.0 index 000000000000,8718559ffb4c..8718559ffb4c mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/freebsd-11.0 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/freebsd-11.0 diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/freebsd-11.2 index 000000000000,14d2d573b2a0..14d2d573b2a0 mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/freebsd-11.2 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/freebsd-11.2 diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/freebsd-11.3 index 000000000000,802cc3630de7..802cc3630de7 mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/freebsd-11.3 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/freebsd-11.3 diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/freenas-9.10.2 index 000000000000,10789c96cc8f..10789c96cc8f mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/freenas-9.10.2 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/freenas-9.10.2 diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/grub2 index 000000000000,4e8f21362554..4e8f21362554 mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/grub2 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/grub2 diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfs-2.0-freebsd index 000000000000,e7ee2f247670..e7ee2f247670 mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfs-2.0-freebsd +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfs-2.0-freebsd diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfs-2.0-linux index 000000000000,ac0f5c863468..ac0f5c863468 mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfs-2.0-linux +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfs-2.0-linux diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfsonosx-1.7.0 index 000000000000,4ae87c964c5e..4ae87c964c5e mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfsonosx-1.7.0 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfsonosx-1.7.0 diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfsonosx-1.8.1 index 000000000000,162ff32a7803..162ff32a7803 mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfsonosx-1.8.1 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfsonosx-1.8.1 diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfsonosx-1.9.3 index 000000000000,b0b28ec04939..b0b28ec04939 mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfsonosx-1.9.3 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfsonosx-1.9.3 diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.6.5 index 000000000000,cb9a94d88951..cb9a94d88951 mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.6.5 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.6.5 diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.7 index 000000000000,22a02936df8c..22a02936df8c mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.7 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.7 diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.8 index 000000000000,762848ef7b4b..762848ef7b4b mode 000000,100644..100644 --- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.8 +++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.8 diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_006_pos.ksh index 000000000000,fe98434d1bb6..fe98434d1bb6 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_006_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_006_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_007_pos.ksh index 000000000000,8c812911b3b3..8c812911b3b3 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_007_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_007_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_008_pos.ksh index 000000000000,0580d444e724..0580d444e724 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_008_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_008_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_features_001_pos.ksh index 000000000000,635125fc0d1e..635125fc0d1e mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_features_001_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_features_001_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_features_001_pos.ksh index 000000000000,5170d31b46da..5170d31b46da mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_features_001_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_features_001_pos.ksh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102181420.11IEK9KJ047278>