diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-10-20 18:08:55 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-10-20 19:26:56 +0000 |
| commit | 87bf66d4a7488c496af110d4d05cc0273d49f82e (patch) | |
| tree | b70778fb6c20fb7011a18ae97116ab0f258e0867 /sys/modules/zfs | |
| parent | 6244b9dc4a03e87246bad1c94067dfe54ff4cdbc (diff) | |
| parent | b2f6de7b58f81a4894ba26d87865a15e6115a1c2 (diff) | |
zfs: merge openzfs/zfs@b2f6de7b5
Notable upstream pull request merges:
#16598 b4e4cbeb2 Always validate checksums for Direct I/O reads
#16603 cefef28e9 vdev_id: multi-lun disks & slot num zero pad
#16613 ab777f436 Return boolean_t in inline functions of
lib/libspl/include/sys/uio.h
#16616 efeb60b86 FreeBSD: ignore some includes when not building kernel
#16617 ca0141f32 zpool/zfs: restore -V & --version options
#16632 7bf525530 zpool/zfs: allow --json wherever -j is allowed
#16635 7e4be9275 zdb: fix printf format in dump_zap()
#16640 48dfe3974 Fallback to strerror() when strerror_l() isn't available
#16650 38a04f0a7 freebsd: Use compiler.h from FreeBSD's base's linuxkpi
#16664 fba6a9069 zfs_debug: Restore log size limit for userspace
#16665 fba6a9069 Fix compile-time warnings caused by duplicate struct
typedefs
#16667 b2f6de7b5 zdb: show bp in uberblock dump
Obtained from: OpenZFS
OpenZFS commit: b2f6de7b58f81a4894ba26d87865a15e6115a1c2
Diffstat (limited to 'sys/modules/zfs')
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 15 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 5dc43281242f..91bb885be72f 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -687,15 +687,6 @@ /* All required iov_iter interfaces are available */ /* #undef HAVE_VFS_IOV_ITER */ -/* fops->iterate() is available */ -/* #undef HAVE_VFS_ITERATE */ - -/* fops->iterate_shared() is available */ -/* #undef HAVE_VFS_ITERATE_SHARED */ - -/* fops->readdir() is available */ -/* #undef HAVE_VFS_READDIR */ - /* address_space_operations->readpages exists */ /* #undef HAVE_VFS_READPAGES */ @@ -801,7 +792,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.3.0-rc1-FreeBSD_g3a9fca901" +#define ZFS_META_ALIAS "zfs-2.3.99-31-FreeBSD_gb2f6de7b5" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -831,10 +822,10 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "rc1-FreeBSD_g3a9fca901" +#define ZFS_META_RELEASE "31-FreeBSD_gb2f6de7b5" /* Define the project version. */ -#define ZFS_META_VERSION "2.3.0" +#define ZFS_META_VERSION "2.3.99" /* count is located in percpu_ref.data */ /* #undef ZFS_PERCPU_REF_COUNT_IN_DATA */ diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 3a1480d8dc66..e090ccb924f2 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.3.0-rc1-0-g3a9fca901" +#define ZFS_META_GITREV "zfs-2.3.99-31-gb2f6de7b5" |