From nobody Thu Jun 09 19:46:18 2022 X-Original-To: dev-commits-src-branches@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 A7E8583D405; Thu, 9 Jun 2022 19:46:18 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LJvjQ4B3fz3LRF; Thu, 9 Jun 2022 19:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654803978; 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=s6uTZcMGzJWGePYuET2aXirFBs8B5MZOzbOGEPgIkQk=; b=Iewr+Bgb5WrvUoSU5QsBbT0TfLfv/P04bpg5CTX9YFwQ/jPFr/e5A7SDEpzQHEL3SX/uBK Cc3tC1LrU7uw6c7p7PyB5jp53av9GB9EIoF+qMyFDA7piY8o67T63sgho3IlzoLZr14SGs q46fJn7mixM6IqT5aL+KlAikxGCXp8CxHjRZQtuZB0sQ+S39/8nAD/AIALb5YvP+4OJNXE ZGBcQ3fxE7fHABrctQ1EV66T6CAx7W8ua9E2u/L5lS1O77Z/Dfr+K3jWKZB/ZjuUpGtbU2 m2M6bQT0WaCkKEBNx7SU6ppn/ojgAcPX/TunXcUHvEjFr1xo8FKfPxlVXY8Ntw== 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 6B4A52404; Thu, 9 Jun 2022 19:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 259JkIZH055198; Thu, 9 Jun 2022 19:46:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 259JkIlR055197; Thu, 9 Jun 2022 19:46:18 GMT (envelope-from git) Date: Thu, 9 Jun 2022 19:46:18 GMT Message-Id: <202206091946.259JkIlR055197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 4b26e201872c - stable/13 - Unbreak the build: Also define NFSV42_OLDNPROCS here. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4b26e201872c8c0647b94986e0090c46c8d1e621 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654803978; 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=s6uTZcMGzJWGePYuET2aXirFBs8B5MZOzbOGEPgIkQk=; b=vha1c57mP96wyMmogQIWSmUjOrGqD8+uKlrkRTNvE6HEbx4IlqY5LmpiuIdzteEZF/N6dw ByJfJDmM0hhSizzSSJuv910lCjVjt/0Aqjr6GeZQNkseGt60aEdBcpL1FhZNIGalPf3b8p uXNwW5ofz5ZRN88uGY68tho6+OWXnn28luhf62sXAU0lhNjvl8pSNCHL4UbGtauLAgW6Fs axToo3y6OEe/DJ+A+dIHORCDLnUc4HI0MbYs2heQ6M9X9oTc30cKnlXoHBjLt+StzPBALi 63KNg4hlhLVRouD+XLTO8ZEKagLSMX3agrT6cA691o3U49Zoti6JvZXrZZP6iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654803978; a=rsa-sha256; cv=none; b=jyVDCU98IP9Zz0yvr+Ev92FhhbNEe1nWmg2xzMUj2R8w0KmGprJLEv5o8hSWLYpjmithHk x+7bhmlAP31pRCXNgPFs8cnFfP6yDN6XR/BQugQezYyVy3iPpDWJxPWmQ7eEcLY7XpInfF IUuq83Mg+5GsaxDFm8By7HrLx3XGXs8goUfgDqr+ego5HhGW7VeGLoE7XvcFhY3uX4On7s coqdF3Vvbnrk42/UQPJ0/wt0FHE1D0Gt5jAdITFPWixgMN5g7Tku/kZxfKe36yEVLP8nY9 izYZoQLpqz8yAo5RYEL4S8ycwRMcE1aXRUAfdJzoSdOcSXANRcBggcOpNc2EsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4b26e201872c8c0647b94986e0090c46c8d1e621 commit 4b26e201872c8c0647b94986e0090c46c8d1e621 Author: Warner Losh AuthorDate: 2022-04-05 17:54:20 +0000 Commit: Rick Macklem CommitDate: 2022-06-09 19:24:52 +0000 Unbreak the build: Also define NFSV42_OLDNPROCS here. If nfsproto.h is included before nfsport.h, then NFSV42_OLDNPROCS would be undefined when it is used in struct nfsstatsov1. (cherry picked from commit 393b7606f9c18c27f340edb28395093b618f68bd) --- sys/fs/nfs/nfsproto.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h index 2e21a70b5d86..ceecc63a7732 100644 --- a/sys/fs/nfs/nfsproto.h +++ b/sys/fs/nfs/nfsproto.h @@ -413,6 +413,9 @@ */ #define NFSV42_NPROCS 70 +/* Value of NFSV42_NPROCS for old nfsstats structure. (Always 69) */ +#define NFSV42_OLDNPROCS 69 + #endif /* NFS_V3NPROCS */ /*