git: 0a17b290c3a9 - stable/13 - nfsd: Continue adding macros so nfsd can run in a vnet prison

[Rick Macklem]

The branch stable/13 has been updated by rmacklem:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=0a17b290c3a95f961593137c8a4bf6b9ebe9c020

commit 0a17b290c3a95f961593137c8a4bf6b9ebe9c020
Author:     Rick Macklem <rmack...@freebsd.org>
AuthorDate: 2023-02-12 21:52:13 +0000
Commit:     Rick Macklem <rmack...@freebsd.org>
CommitDate: 2023-05-17 22:07:04 +0000

    nfsd: Continue adding macros so nfsd can run in a vnet prison
    
    Commit 7344856e3a6d added a lot of macros that will front end
    vnet macros so that nfsd(8) can run in vnet prison.
    This patch adds some more of them.
    
    (cherry picked from commit ab0440af75ba0c2dbf263c5441ccbe4058515fff)
---
 sys/fs/nfs/nfsdport.h   |  2 +-
 sys/fs/nfs/nfsrvstate.h | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/sys/fs/nfs/nfsdport.h b/sys/fs/nfs/nfsdport.h
index 6d468219adf3..26bd57d5736d 100644
--- a/sys/fs/nfs/nfsdport.h
+++ b/sys/fs/nfs/nfsdport.h
@@ -92,7 +92,7 @@ struct nfsexstuff {
      bcmp(&(f1)->fh_fid, &(f2)->fh_fid, sizeof(struct fid)) == 0)
 
 #define        NFSLOCKHASH(f)                                                  
\
-       (&nfslockhash[nfsrv_hashfh(f) % nfsrv_lockhashsize])
+       (&NFSD_VNET(nfslockhash)[nfsrv_hashfh(f) % nfsrv_lockhashsize])
 
 #define        NFSFPVNODE(f)   ((f)->f_vnode)
 #define        NFSFPCRED(f)    ((f)->f_cred)
diff --git a/sys/fs/nfs/nfsrvstate.h b/sys/fs/nfs/nfsrvstate.h
index 4c171e8b3f50..4dc9729a952f 100644
--- a/sys/fs/nfs/nfsrvstate.h
+++ b/sys/fs/nfs/nfsrvstate.h
@@ -58,18 +58,18 @@ LIST_HEAD(nfsdontlisthead, nfsdontlist);
 TAILQ_HEAD(nfsuserhashhead, nfsusrgrp);
 
 #define        NFSCLIENTHASH(id)                                               
\
-       (&nfsclienthash[(id).lval[1] % nfsrv_clienthashsize])
+       (&NFSD_VNET(nfsclienthash)[(id).lval[1] % nfsrv_clienthashsize])
 #define        NFSSTATEHASH(clp, id)                                           
\
        (&((clp)->lc_stateid[(id).other[2] % nfsrv_statehashsize]))
 #define        NFSUSERHASH(id)                                                 
\
-       (&nfsuserhash[(id) % nfsrv_lughashsize])
+       (&NFSD_VNET(nfsuserhash)[(id) % nfsrv_lughashsize])
 #define        NFSUSERNAMEHASH(p, l)                                           
\
-       (&nfsusernamehash[((l)>=4?(*(p)+*((p)+1)+*((p)+2)+*((p)+3)):*(p)) \
+       
(&NFSD_VNET(nfsusernamehash)[((l)>=4?(*(p)+*((p)+1)+*((p)+2)+*((p)+3)):*(p)) \
                % nfsrv_lughashsize])
 #define        NFSGROUPHASH(id)                                                
\
-       (&nfsgrouphash[(id) % nfsrv_lughashsize])
+       (&NFSD_VNET(nfsgrouphash)[(id) % nfsrv_lughashsize])
 #define        NFSGROUPNAMEHASH(p, l)                                          
\
-       (&nfsgroupnamehash[((l)>=4?(*(p)+*((p)+1)+*((p)+2)+*((p)+3)):*(p)) \
+       
(&NFSD_VNET(nfsgroupnamehash)[((l)>=4?(*(p)+*((p)+1)+*((p)+2)+*((p)+3)):*(p)) \
                % nfsrv_lughashsize])
 
 struct nfssessionhash {
@@ -77,7 +77,8 @@ struct nfssessionhash {
        struct nfssessionhashhead       list;
 };
 #define        NFSSESSIONHASH(f)                                               
\
-       (&nfssessionhash[nfsrv_hashsessionid(f) % nfsrv_sessionhashsize])
+       (&NFSD_VNET(nfssessionhash)[nfsrv_hashsessionid(f) %            \
+        nfsrv_sessionhashsize])
 
 struct nfslayouthash {
        struct mtx              mtx;