The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=939a62d673e6c340ee2b7243074a529919e39196
commit 939a62d673e6c340ee2b7243074a529919e39196 Author: Alexander Motin <[email protected]> AuthorDate: 2023-11-04 16:26:25 +0000 Commit: Alexander Motin <[email protected]> CommitDate: 2023-11-04 16:26:25 +0000 stand/zfs: Remove read-compatible features These features are marked as ZFEATURE_FLAG_READONLY_COMPAT and so irrelevant for read-only pool imports by the loader: "com.datto:resilver_defer", "com.delphix:obsolete_counts", "com.delphix:spacemap_histogram", "com.delphix:zpool_checkpoint", "com.intel:allocation_classes", "org.zfsonlinux:allocation_classes" This should cause no functional changes, just a code cleanup. MFC after: 2 months --- stand/libsa/zfs/zfsimpl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index b904ead24e1d..253cfd2f16e3 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -113,23 +113,19 @@ typedef struct indirect_vsd { static vdev_list_t zfs_vdevs; /* - * List of ZFS features supported for read + * List of supported read-incompatible ZFS features. Do not add here features + * marked as ZFEATURE_FLAG_READONLY_COMPAT, they are irrelevant for read-only! */ static const char *features_for_read[] = { "com.datto:bookmark_v2", "com.datto:encryption", - "com.datto:resilver_defer", "com.delphix:bookmark_written", "com.delphix:device_removal", "com.delphix:embedded_data", "com.delphix:extensible_dataset", "com.delphix:head_errlog", "com.delphix:hole_birth", - "com.delphix:obsolete_counts", - "com.delphix:spacemap_histogram", "com.delphix:spacemap_v2", - "com.delphix:zpool_checkpoint", - "com.intel:allocation_classes", "com.joyent:multi_vdev_crash_dump", "com.klarasystems:vdev_zaps_v2", "org.freebsd:zstd_compress", @@ -138,7 +134,6 @@ static const char *features_for_read[] = { "org.illumos:skein", "org.open-zfs:large_blocks", "org.openzfs:blake3", - "org.zfsonlinux:allocation_classes", "org.zfsonlinux:large_dnode", NULL };
