diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-02-16 21:38:51 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-02-16 21:38:51 +0000 |
| commit | c9539b89010900499a200cdd6c0265ea5d950875 (patch) | |
| tree | 70b0c96e5b8d5a881081847c8b6daf87624d3282 /sys/modules/zfs | |
| parent | 6606096986222bac46e6f97d6ca47fc14978d172 (diff) | |
| parent | 57cfae4a2f04aaff10c45b3f7975e0fe3ef3e8b8 (diff) | |
zfs: merge openzfs/zfs@57cfae4a2 (master)
Notable upstream pull request merges:
#13816 Fix a race condition in dsl_dataset_sync() when
activating features
#14402 Prefetch on deadlists merge
#14410 Improve resilver ETAs
#14428 Resilver performance tuning
#14439 Resolve WS-2021-0184 vulnerability in zstd
#14440 EIO caused by encryption + recursive gang
#14448 Fix console progress reporting for recursive send
#14454 Improve arc_read() error reporting
#14460 Restore FreeBSD to use .rodata
#14474 Reduce need for contiguous memory for ioctls
Obtained from: OpenZFS
OpenZFS commit: 57cfae4a2f04aaff10c45b3f7975e0fe3ef3e8b8
Diffstat (limited to 'sys/modules/zfs')
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 7 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 5c30abf047f4..0d4fea6ea856 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -296,6 +296,9 @@ /* fault_in_iov_iter_readable() is available */ /* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + /* fops->aio_fsync() exists */ /* #undef HAVE_FILE_AIO_FSYNC */ @@ -985,7 +988,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_g9cd71c860" +#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_g57cfae4a2" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1015,7 +1018,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_g9cd71c860" +#define ZFS_META_RELEASE "FreeBSD_g57cfae4a2" /* Define the project version. */ #define ZFS_META_VERSION "2.1.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 334a458f9647..0d4020f71888 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.1.99-1706-g9cd71c860" +#define ZFS_META_GITREV "zfs-2.1.99-1734-g57cfae4a2" |