From c4a896352634202bbc8496e22ae970b77899d684 Mon Sep 17 00:00:00 2001
From: Ryan Moeller <ryan@iXsystems.com>
Date: Thu, 7 Oct 2021 17:32:35 -0400
Subject: [PATCH] Fully remove feature@xattr_compat

Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
---
 include/zfeature_common.h                           |  1 -
 lib/libzfs/libzfs.abi                               |  3 +--
 module/zcommon/zfeature_common.c                    | 13 -------------
 .../functional/cli_root/zpool_get/zpool_get.cfg     |  1 -
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/include/zfeature_common.h b/include/zfeature_common.h
index 88a28f042d32..76dd7ed57478 100644
--- a/include/zfeature_common.h
+++ b/include/zfeature_common.h
@@ -75,7 +75,6 @@ typedef enum spa_feature {
 	SPA_FEATURE_DEVICE_REBUILD,
 	SPA_FEATURE_ZSTD_COMPRESS,
 	SPA_FEATURE_DRAID,
-	SPA_FEATURE_XATTR_COMPAT,
 	SPA_FEATURES
 } spa_feature_t;
 
diff --git a/lib/libzfs/libzfs.abi b/lib/libzfs/libzfs.abi
index 16a2b9ec4d02..98d2c6bf6be8 100644
--- a/lib/libzfs/libzfs.abi
+++ b/lib/libzfs/libzfs.abi
@@ -822,8 +822,7 @@
       <enumerator name='SPA_FEATURE_DEVICE_REBUILD' value='31'/>
       <enumerator name='SPA_FEATURE_ZSTD_COMPRESS' value='32'/>
       <enumerator name='SPA_FEATURE_DRAID' value='33'/>
-      <enumerator name='SPA_FEATURE_XATTR_COMPAT' value='34'/>
-      <enumerator name='SPA_FEATURES' value='35'/>
+      <enumerator name='SPA_FEATURES' value='34'/>
     </enum-decl>
     <typedef-decl name='zfeature_flags_t' type-id='type-id-88' filepath='../../include/zfeature_common.h' line='96' column='1' id='type-id-84'/>
     <enum-decl name='zfeature_flags' filepath='../../include/zfeature_common.h' line='84' column='1' id='type-id-88'>
diff --git a/module/zcommon/zfeature_common.c b/module/zcommon/zfeature_common.c
index 48c90d384ff2..fc0e09605eef 100644
--- a/module/zcommon/zfeature_common.c
+++ b/module/zcommon/zfeature_common.c
@@ -598,19 +598,6 @@ zpool_feature_init(void)
 	zfeature_register(SPA_FEATURE_DRAID,
 	    "org.openzfs:draid", "draid", "Support for distributed spare RAID",
 	    ZFEATURE_FLAG_MOS, ZFEATURE_TYPE_BOOLEAN, NULL);
-
-
-	{
-	static const spa_feature_t xattr_compat_deps[] = {
-		SPA_FEATURE_EXTENSIBLE_DATASET,
-		SPA_FEATURE_NONE
-	};
-	zfeature_register(SPA_FEATURE_XATTR_COMPAT,
-	    "com.ixsystems:xattr_compat", "xattr_compat",
-	    "Support for cross-platform compatible xattr namespace encoding",
-	    ZFEATURE_FLAG_PER_DATASET, ZFEATURE_TYPE_BOOLEAN,
-	    xattr_compat_deps);
-	}
 }
 
 #if defined(_KERNEL)
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg b/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg
index 20d29c9169e6..6075e1f1abbd 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg
@@ -82,7 +82,6 @@ typeset -a properties=(
     "feature@log_spacemap"
     "feature@device_rebuild"
     "feature@draid"
-    "feature@xattr_compat"
 )
 
 if is_linux || is_freebsd; then