diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2024-03-30 21:14:52 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2024-03-30 22:54:24 +0000 |
| commit | 783d3ff6d7fae619db8a7990b8a6387de0c677b5 (patch) | |
| tree | 65cb185ab0070b76470d829cea081e9443de79e2 /sys/modules/zfs | |
| parent | e0388a906ca77d07c99e8762d47dccaaaefd8bab (diff) | |
| parent | 39be46f43f96fb7420386d03751b01f5cb376d6b (diff) | |
zfs: merge openzfs/zfs@39be46f43
Notable upstream pull request merges:
#15509 b1e46f869 Add ashift validation when adding devices to a pool
#15927 45e23abed Update resume token at object receive
#15941 bf8f72359 BRT: Skip duplicate BRT prefetches
#15950 8cd8ccca5 BRT: Skip getting length in brt_entry_lookup()
#15951 80cc51629 ZAP: Massively switch to _by_dnode() interfaces
#15954 2c01cae8b BRT: Change brt_pending_tree sorting order
#15955 4616b96a6 BRT: Relax brt_pending_apply() locking
#15959 5c4a4f82c zio: update ZIO type x stage documentation
#15962 493fcce9b Provide macros for setting and getting blkptr birth times
#15963 90ff73235 freebsd: fix missing headers in distribution tarball
#15967 f68bde723 BRT: Make BRT block sizes configurable
#15976 c28f94f32 ZAP: Some cleanups/micro-optimizations
#15995 cfb96c772 vdev_disk: clean up spa/bdev mode conversion
#16006 c0aab8b8f zvols: prevent overflow of minor device numbers
#16007 a89d209bb BRT: Fix holes cloning
#16008 c9d8f6c59 Fix option string, adding -e and fixing order
Obtained from: OpenZFS
OpenZFS commit: 39be46f43f96fb7420386d03751b01f5cb376d6b
Diffstat (limited to 'sys/modules/zfs')
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 10 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index d3fa8b6c5aff..267fe048749c 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -664,6 +664,9 @@ /* Define to 1 if you have the `mlockall' function. */ #define HAVE_MLOCKALL 1 +/* page_size() is available */ +/* #undef HAVE_MM_PAGE_SIZE */ + /* lookup_bdev() wants mode arg */ /* #undef HAVE_MODE_LOOKUP_BDEV */ @@ -993,6 +996,9 @@ /* __set_page_dirty_nobuffers exists */ /* #undef HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS */ +/* splice_copy_file_range() is available */ +/* #undef HAVE_VFS_SPLICE_COPY_FILE_RANGE */ + /* __vmalloc page flags exists */ /* #undef HAVE_VMALLOC_PAGE_KERNEL */ @@ -1155,7 +1161,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-365-FreeBSD_g8f2f6cd2a" +#define ZFS_META_ALIAS "zfs-2.2.99-398-FreeBSD_g39be46f43" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1185,7 +1191,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "365-FreeBSD_g8f2f6cd2a" +#define ZFS_META_RELEASE "398-FreeBSD_g39be46f43" /* 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 821a84187a9c..8dd18c18c0c5 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-365-g8f2f6cd2a-dirty" +#define ZFS_META_GITREV "zfs-2.2.99-398-g39be46f43" |