aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs/module
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2021-02-26 21:52:41 +0000
committerMartin Matuska <mm@FreeBSD.org>2021-02-26 23:05:50 +0000
commitc170aa9f37e4ce9338a0f26e3e983f7123ea8c1a (patch)
treecbb825482c248af0d4ef576f21de1273b00e694f /sys/contrib/openzfs/module
parent9e83a6a556ed8d9a2821de5d5f5c7d4b1292c694 (diff)
downloadsrc-c170aa9f37e4ce9338a0f26e3e983f7123ea8c1a.tar.gz
src-c170aa9f37e4ce9338a0f26e3e983f7123ea8c1a.zip
zfs: add missing checks for unsupported features
After the merge of OpenZFS master-9312e0fd1 it has become possible to import ZFS pools witn an active org.illumos:edonr feature on FreeBSD, leading to a panic. In addition, "zpool status" reported all pools without edonr as upgradable and "zpool upgrade -v" lists edonr in the list of upgradable features. This is an accepted but not yet included bugfix by upstream. Obtained from: https://github.com/openzfs/zfs/pull/11653 Differential Revision: https://reviews.freebsd.org/D28935 Reported by: garga (on freebsd-current@) Reviewed by: freqlabs X-MFC-with: ba27dd8be821792e15bdabfac69fd6cab0cf9dd3
Diffstat (limited to 'sys/contrib/openzfs/module')
-rw-r--r--sys/contrib/openzfs/module/zcommon/zfeature_common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/contrib/openzfs/module/zcommon/zfeature_common.c b/sys/contrib/openzfs/module/zcommon/zfeature_common.c
index e95a85e89ba2..fc0e09605eef 100644
--- a/sys/contrib/openzfs/module/zcommon/zfeature_common.c
+++ b/sys/contrib/openzfs/module/zcommon/zfeature_common.c
@@ -100,6 +100,8 @@ zfeature_is_supported(const char *guid)
for (spa_feature_t i = 0; i < SPA_FEATURES; i++) {
zfeature_info_t *feature = &spa_feature_table[i];
+ if (!feature->fi_zfs_mod_supported)
+ continue;
if (strcmp(guid, feature->fi_guid) == 0)
return (B_TRUE);
}