diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-09-24 21:32:11 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-09-24 21:58:34 +0000 |
| commit | abcdc1b9aed7e0b7b07b47ae14c960c9cefe882f (patch) | |
| tree | 75ba3f2d98d6ac75b626593af5fdf064b001a467 /sys/modules/zfs | |
| parent | 0a5d2802b41fd216d9a345f749af1a6ccbe9f382 (diff) | |
| parent | 2e2a46e0a597b3ee606ea7dc5bc527459077322f (diff) | |
zfs: merge openzfs/zfs@2e2a46e0a
Notable upstream pull request merges:
#15243 b53077a9e Add zfs_prepare_disk script for disk firmware install
#15298 2e2a46e0a Invoke zdb by guid to avoid import errors
#15301 e5d70f467 ZIL: Avoid dbuf_read() in ztest_get_data()
Obtained from: OpenZFS
OpenZFS commit: 2e2a46e0a597b3ee606ea7dc5bc527459077322f
Diffstat (limited to 'sys/modules/zfs')
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 19 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
2 files changed, 18 insertions, 3 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index f0c1dd4726a8..1accbe621d17 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -349,6 +349,9 @@ /* Define if compiler supports -Wformat-overflow */ /* #undef HAVE_FORMAT_OVERFLOW */ +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + /* fops->fsync() with range */ /* #undef HAVE_FSYNC_RANGE */ @@ -361,6 +364,9 @@ /* generic_fillattr requires struct mnt_idmap* */ /* #undef HAVE_GENERIC_FILLATTR_IDMAP */ +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + /* generic_fillattr requires struct user_namespace* */ /* #undef HAVE_GENERIC_FILLATTR_USERNS */ @@ -424,6 +430,9 @@ /* Define if compiler supports -Winfinite-recursion */ /* #undef HAVE_INFINITE_RECURSION */ +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + /* yes */ /* #undef HAVE_INODE_LOCK_SHARED */ @@ -436,6 +445,9 @@ /* inode_owner_or_capable() takes user_ns */ /* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + /* inode_set_flags() exists */ /* #undef HAVE_INODE_SET_FLAGS */ @@ -828,6 +840,9 @@ /* super_block->s_user_ns exists */ /* #undef HAVE_SUPER_USER_NS */ +/* sync_blockdev() is declared in include/blkdev.h */ +/* #undef HAVE_SYNC_BLOCKDEV */ + /* struct kobj_type has default_groups */ /* #undef HAVE_SYSFS_DEFAULT_GROUPS */ @@ -1095,7 +1110,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.99-FreeBSD_g4647353c8" +#define ZFS_META_ALIAS "zfs-2.2.99-FreeBSD_g2e2a46e0a" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1125,7 +1140,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_g4647353c8" +#define ZFS_META_RELEASE "FreeBSD_g2e2a46e0a" /* 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 74b5462e6ea1..d3eeaf9d098c 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-103-g4647353c8" +#define ZFS_META_GITREV "zfs-2.2.99-110-g2e2a46e0a" |