Date: Thu, 29 Aug 2024 17:45:28 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: a58ece87303f - main - zfsd tests: Update the mock zpool_handle Message-ID: <202408291745.47THjSOe049069@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a58ece87303f882367105c92a27268ed6befa655 commit a58ece87303f882367105c92a27268ed6befa655 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2024-08-29 17:37:57 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2024-08-29 17:40:44 +0000 zfsd tests: Update the mock zpool_handle The zfsd tests rely on this having the same layout as the real zpool_handle, which changed in the last OpenZFS import. Fixes: 62e7d3c89ebd ("ddt: add support for prefetching tables into the ARC") Reported by: Jenkins --- cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc index f1e925b0b4ef..6c9a49a8ebbf 100644 --- a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc +++ b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc @@ -82,6 +82,9 @@ struct zpool_handle zpool_handle_t *zpool_next; char zpool_name[ZFS_MAX_DATASET_NAME_LEN]; int zpool_state; + unsigned int zpool_n_propnames; +#define ZHP_MAX_PROPNAMES 4 + const char *zpool_propnames[ZHP_MAX_PROPNAMES]; size_t zpool_config_size; nvlist_t *zpool_config; nvlist_t *zpool_old_config;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408291745.47THjSOe049069>