]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
zfs: merge OpenZFS master-bf156c966
authorMartin Matuska <mm@FreeBSD.org>
Thu, 18 Feb 2021 14:17:31 +0000 (15:17 +0100)
committerMartin Matuska <mm@FreeBSD.org>
Wed, 10 Mar 2021 01:25:54 +0000 (02:25 +0100)
commite1f9a18f917d9d5a3f88419bc72c9ee2fbb1c8df
tree8ee43090116813993768230992add4d474fb0b62
parent9e8f831780f7107c1c2ace3713b19d50ec825581
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

(cherry picked from commit ee36e25a86cbe2a9474c1d61f2c4b450da8ef952)
53 files changed:
sys/contrib/openzfs/cmd/zpool/Makefile.am
sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2018 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2019 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2020 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/compat-2021 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/freebsd-11.0 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/freebsd-11.2 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/freebsd-11.3 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/freenas-9.10.2 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/grub2 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfs-2.0-freebsd [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfs-2.0-linux [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfsonosx-1.7.0 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfsonosx-1.8.1 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfsonosx-1.9.3 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.6.5 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.7 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.8 [new file with mode: 0644]
sys/contrib/openzfs/cmd/zpool/zpool_main.c
sys/contrib/openzfs/cmd/ztest/ztest.c
sys/contrib/openzfs/config/Rules.am
sys/contrib/openzfs/include/libzfs.h
sys/contrib/openzfs/include/sys/fs/zfs.h
sys/contrib/openzfs/include/sys/spa_impl.h
sys/contrib/openzfs/include/zfeature_common.h
sys/contrib/openzfs/lib/libzfs/libzfs.abi
sys/contrib/openzfs/lib/libzfs/libzfs_pool.c
sys/contrib/openzfs/lib/libzfs/libzfs_status.c
sys/contrib/openzfs/lib/libzutil/zutil_import.c
sys/contrib/openzfs/man/man5/zpool-features.5
sys/contrib/openzfs/man/man8/zpool-create.8
sys/contrib/openzfs/man/man8/zpool-upgrade.8
sys/contrib/openzfs/man/man8/zpoolprops.8
sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c
sys/contrib/openzfs/module/zcommon/zfeature_common.c
sys/contrib/openzfs/module/zcommon/zpool_prop.c
sys/contrib/openzfs/module/zfs/spa.c
sys/contrib/openzfs/module/zfs/spa_config.c
sys/contrib/openzfs/rpm/generic/zfs.spec.in
sys/contrib/openzfs/scripts/Makefile.am
sys/contrib/openzfs/tests/runfiles/common.run
sys/contrib/openzfs/tests/zfs-tests/cmd/xattrtest/xattrtest.c
sys/contrib/openzfs/tests/zfs-tests/include/default.cfg.in
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.am
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_006_pos.ksh [new file with mode: 0755]
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_007_pos.ksh [new file with mode: 0755]
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_008_pos.ksh [new file with mode: 0755]
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/Makefile.am
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_features_001_pos.ksh [new file with mode: 0755]
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.am
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_features_001_pos.ksh [new file with mode: 0755]