diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-09-09 16:13:02 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-09-09 16:13:02 +0000 |
| commit | e2df9bb44109577475aeb186e7186ac040f9bde1 (patch) | |
| tree | 50f77b5169bca65525d6bf35d07c5b2079d971f9 /sys/modules/zfs | |
| parent | f05795e3f65f305cb770ae91d8e9c8f05d267e0d (diff) | |
| parent | b109925820fb79db3e37670c159977f03edd950f (diff) | |
zfs: merge openzfs/zfs@b10992582
Notable upstream pull request merges:
#15892 -multiple Fast Dedup: Introduce the FDT on-disk format and feature flag
#15893 -multiple Fast Dedup: “flat” DDT entry format
#15895 -multiple Fast Dedup: FDT-log feature
#16239 6be8bf555 zpool: Provide GUID to zpool-reguid(8) with -g
#16277 -multiple Fast Dedup: prune unique entries
#16316 5807de90a Fix null ptr deref when renaming a zvol with snaps and snapdev=visible
#16343 77a797a38 Enable L2 cache of all (MRU+MFU) metadata but MFU data only
#16446 83f359245 FreeBSD: fix build without kernel option MAC
#16449 963e6c9f3 Fix incorrect error report on vdev attach/replace
#16505 b10992582 spa_prop_get: require caller to supply output nvlist
Obtained from: OpenZFS
OpenZFS commit: b109925820fb79db3e37670c159977f03edd950f
Diffstat (limited to 'sys/modules/zfs')
| -rw-r--r-- | sys/modules/zfs/Makefile | 3 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 6 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index d45488dcb346..7fba05b962ce 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -217,6 +217,7 @@ SRCS+= zfeature_common.c \ zfs_fletcher_superscalar4.c \ zfs_namecheck.c \ zfs_prop.c \ + zfs_valstr.c \ zpool_prop.c \ zprop_common.c @@ -237,6 +238,7 @@ SRCS+= abd.c \ bqueue.c \ dataset_kstats.c \ ddt.c \ + ddt_log.c \ ddt_stats.c \ ddt_zap.c \ dmu.c \ @@ -389,6 +391,7 @@ CFLAGS.gcc+= -Wno-pointer-to-int-cast CFLAGS.abd.c= -Wno-cast-qual CFLAGS.ddt.c= -Wno-cast-qual +CFLAGS.ddt_log.c= -Wno-cast-qual -Wno-pointer-arith CFLAGS.ddt_zap.c= -Wno-cast-qual CFLAGS.dmu.c= -Wno-cast-qual CFLAGS.dmu_traverse.c= -Wno-cast-qual diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 2508de5421df..2edd53c4001d 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -1215,7 +1215,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-634-FreeBSD_gd2ccc2155" +#define ZFS_META_ALIAS "zfs-2.2.99-693-FreeBSD_gb10992582" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1224,7 +1224,7 @@ /* #undef ZFS_META_DATA */ /* Define the maximum compatible kernel version. */ -#define ZFS_META_KVER_MAX "6.9" +#define ZFS_META_KVER_MAX "6.10" /* Define the minimum compatible kernel version. */ #define ZFS_META_KVER_MIN "3.10" @@ -1245,7 +1245,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "634-FreeBSD_gd2ccc2155" +#define ZFS_META_RELEASE "693-FreeBSd_gb10992582" /* Define the project version. */ #define ZFS_META_VERSION "2.2.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 23b7a5afa4ce..2113c3fc2680 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.2.99-634-gd2ccc2155" +#define ZFS_META_GITREV "zfs-2.2.99-693-gb10992582" |