From nobody Tue Apr 05 17:58:47 2022 X-Original-To: dev-commits-src-all@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 EF1E61A99BD5; Tue, 5 Apr 2022 17:58:47 +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 4KXwPM6HWhz3jpx; Tue, 5 Apr 2022 17:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649181527; 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=6Kuz35ixk495bRP/Z6lQW/w1H9FyaISbEva3j7Q8uNU=; b=dzFSw0x+oB3JCC0nsd21CDAQWtP0tIkmo9D+q9CplizHHBv6o1N8fBdDJFT0+ZLPOZX8aT mkx0o828NPLfbHQOvshMmyzkq4aRZJ+fE6lPsztEINC824yrOvN27t+J3ia1f2Owyxc+LJ fWto6fLmcbzgRW3vVVncCS37yqOp3Ag/b6hVcHRhWbvgmt+E71UAGylKbFRsxFpeG8EkvT 9O3aCnL4htHGZP5HfcUNJusPasAFLgeJOzKOWwHpC4vPa2hCnUQ5zFlQpY8r0E6WJkciyJ xbp5C87Qsu7K9bFfrj7gNvO+2DweRQKK+Ouj7WZVVYcNJY5cVtlPLdd/naOrLg== 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 B7C043039; Tue, 5 Apr 2022 17:58:47 +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 235Hwl9U090278; Tue, 5 Apr 2022 17:58:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 235Hwl3b090277; Tue, 5 Apr 2022 17:58:47 GMT (envelope-from git) Date: Tue, 5 Apr 2022 17:58:47 GMT Message-Id: <202204051758.235Hwl3b090277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 393b7606f9c1 - main - Unbreak the build: Also define NFSV42_OLDNPROCS here. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 393b7606f9c18c27f340edb28395093b618f68bd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649181527; 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=6Kuz35ixk495bRP/Z6lQW/w1H9FyaISbEva3j7Q8uNU=; b=a3OMsqMB+sMKiMkwuh0k/NPeiDOBa3VPlZZfWlcd1n1va1RO+Q2VFknej/U2pvg+kKlXEj F8GdCv8xMLDgE/G0zFiGBwRypVPCQ3f8u4dgE47kCo0dAvuJXuRUMLMalXUFv8FbvTWF6g 6uoim0cGr+CZPpYqKC3El2Xhpn90Rbxr/YTXCeeLoeS8gyH29k/rOJRw66vmy9S1LMlp+x K1VxIHVo7ivvyfBzT34lwi7P0O+wptz5n/Gcclfr4qbkgFf1LlWFqQlDzaHy33rTbjUWra pa8db6vCBEY00InZJz155q4BmERC3Q3iNef3VMUGxUuQcGas3BWgNCChE7UIKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649181527; a=rsa-sha256; cv=none; b=WPsU+OJzq1SyWkVvpOj1sG4cRNwaVScpt53AAgPHV/JO1aWMZ/jLf+UnX8PgkuWKDtFBw0 8YKgvDDvxIerX0s/aKJ0depQ187I8Oryp5R0enEgyYTlpbc1qlXE1gotR1ucAMjBj2fYzy uWXMWSdivx6kwsruLuoyFYWQ3Igx6K5Xjw4VXCt8Mxx9zGPI4SBvApLcmjI/AzLu2NuLb4 rM/zvDY5N0nQRcY6ZMWpiPU4iySxBXcO/Wn+swpjrf4MzpEkpYYw9gZevh6rBpm5X8n1ES xZSC2MDPf5sCICcXIuJhmq5mW3DBR8P7ojNjPit8Z5A+DASc9mnf+61bSle8rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=393b7606f9c18c27f340edb28395093b618f68bd commit 393b7606f9c18c27f340edb28395093b618f68bd Author: Warner Losh AuthorDate: 2022-04-05 17:54:20 +0000 Commit: Warner Losh CommitDate: 2022-04-05 17:54:20 +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. Sponsored by: Netflix --- 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 */ /*