diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-03-07 09:49:48 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-03-07 09:52:19 +0000 |
| commit | 4fefe1b763573c873bf3dbf3b6f28c22de0ffada (patch) | |
| tree | a797519c5b16fdbd016ff8b1996780f37e2dbd6a /sys/modules/zfs | |
| parent | cbddb2f02c7687d1039abcffd931e94e481c11a5 (diff) | |
| parent | 8f2f6cd2ac688916adb2caf979daf95365ccb48f (diff) | |
zfs: merge openzfs/zfs@8f2f6cd2a
Notable upstream pull request merges:
#15887 -multiple Fast Dedup: Cleanup and documentation ahead of
integrating Fast Dedup
#15907 5600dff0e Fixed parameter passing error when calling zfs_acl_chmod
#15908 8f2f6cd2a ddt: reduce DDT_NAMELEN
Obtained from: OpenZFS
OpenZFS commit: 8f2f6cd2ac688916adb2caf979daf95365ccb48f
Diffstat (limited to 'sys/modules/zfs')
| -rw-r--r-- | sys/modules/zfs/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 4 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 056e6a015971..654f0044a8fc 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -238,6 +238,7 @@ SRCS+= abd.c \ bqueue.c \ dataset_kstats.c \ ddt.c \ + ddt_stats.c \ ddt_zap.c \ dmu.c \ dmu_diff.c \ @@ -389,6 +390,7 @@ CFLAGS.gcc+= -Wno-pointer-to-int-cast CFLAGS.abd.c= -Wno-cast-qual CFLAGS.ddt.c= -Wno-cast-qual +CFLAGS.ddt_zap.c= -Wno-cast-qual CFLAGS.dmu.c= -Wno-cast-qual CFLAGS.dmu_traverse.c= -Wno-cast-qual CFLAGS.dnode.c= ${NO_WUNUSED_BUT_SET_VARIABLE} diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 5a3e421ab67e..d3fa8b6c5aff 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -1155,7 +1155,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-345-FreeBSD_ge0bd8118d" +#define ZFS_META_ALIAS "zfs-2.2.99-365-FreeBSD_g8f2f6cd2a" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1185,7 +1185,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "345-FreeBSD_ge0bd8118d" +#define ZFS_META_RELEASE "365-FreeBSD_g8f2f6cd2a" /* 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 9370fe080d71..821a84187a9c 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-345-ge0bd8118d" +#define ZFS_META_GITREV "zfs-2.2.99-365-g8f2f6cd2a-dirty" |