git: 4b26e201872c - stable/13 - Unbreak the build: Also define NFSV42_OLDNPROCS here.

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Rick Macklem <rmacklem_at_FreeBSD.org>
Date: Thu, 09 Jun 2022 19:46:18 UTC

The branch stable/13 has been updated by rmacklem:

URL: https://cgit.FreeBSD.org/src/commit/?id=4b26e201872c8c0647b94986e0090c46c8d1e621

commit 4b26e201872c8c0647b94986e0090c46c8d1e621
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-04-05 17:54:20 +0000
Commit:     Rick Macklem <rmacklem@FreeBSD.org>
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 */
 
 /*