From nobody Thu Aug 29 17:45:28 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WvpbD1z1Pz5THqV; Thu, 29 Aug 2024 17:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WvpbD1Wr3z3wlY; Thu, 29 Aug 2024 17:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724953528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5HJTup70t+8kYkt9vKSoq3PegChYHTOTdU2opgf+dok=; b=o/Va8MV0qv3PGrBnqjgfJrcyiI6ZekFJ4mYUlVckNHx0RrC3LMARDMmRH9OgNXakDhHQq2 gRNjdSDeJ39YAepza/pqfAGvnj97dNszurkJ8zXcuvQ9LVDf6CDXvvwmEUeU3N8s5Bj+o5 l0KcOaK6B8TbboK039c4bZuOSOHhNpTt7QG/FcDASn5qa3QAke0LUSF7721la6RzzQfWR2 9B3l+nT5+LfJcvHjQH7VLwLCLEOL6fs8Bda0uGe+TXwDoIJXjW+PpbqzrFMLE36jIMgWCe 2oPn1+WGfbn0OsXv7wzxJnuglia6WjWQAuYaAw9qI9Y6YWzRvK+c9a27jMeJWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724953528; a=rsa-sha256; cv=none; b=Vu1TzThUpWbikHEld58YVmbNqlneabPPs0Gyx4ILzLrUOR2CaW8vzqxm/4kkoj4fBWCS1O dufxvxbxrMELrmI8B9DfcULVOCyRjX/eCXSs+L7KLQSiCgMVhv9oGp8KpYgWPVQJ8ptyMl CKacGVJehPzV2RvLHCVjYMFdkOYXcPrsLjtA/ZsdnAvLgTdHvK6GvGf4+CLxn3jnpVVaTJ F9+DIVoJdX9yfOVQf607PHzOznaSQ/h8B0avhSEVatObgATw4GdBR5z3j6Ls29lXi1w9SP 6jnsTaB1bFtnb0P/3p1I7UsMvX0R4nxN0RSG5sS4GZL2rbgyx88LvqPyrUsyDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724953528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5HJTup70t+8kYkt9vKSoq3PegChYHTOTdU2opgf+dok=; b=P6m4JolVIgaVrDmrJZFQeaHNA/7DJ7oEZbGMzf8DUIporKV95r8mDvGTxnmB6yrlaYyQVN 4Q27zZkcZE0Bl5gNqJSrGRWj4CeRSGY7zW1NHeA4JSKiE4Ep97X8WcYzrwQUqVYfc2vCjU /QNLUWhZoijYlIdmQY1bDB7b+D7V5oBXpA3/TuFA9ciCuj+cMFR2z7FCkphNCNQdHiqm/T TgCn8ESt3yqsIlJKs0PEYCYxCTpASmRKV8F41W1n3EvqpYssZiRLpmSBSCZsJu1YWMbGEb gwINbPJaqtgSG5LzbIC7rDYR+YlbcW0OfukyKkyu9d0+hXETI1jWrSxEuc30mA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WvpbD11q2zRr8; Thu, 29 Aug 2024 17:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47THjSSS049072; Thu, 29 Aug 2024 17:45:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47THjSOe049069; Thu, 29 Aug 2024 17:45:28 GMT (envelope-from git) Date: Thu, 29 Aug 2024 17:45:28 GMT Message-Id: <202408291745.47THjSOe049069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a58ece87303f - main - zfsd tests: Update the mock zpool_handle List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a58ece87303f882367105c92a27268ed6befa655 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a58ece87303f882367105c92a27268ed6befa655 commit a58ece87303f882367105c92a27268ed6befa655 Author: Mark Johnston AuthorDate: 2024-08-29 17:37:57 +0000 Commit: Mark Johnston 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;