git: 821976facf74 - main - nfsd: Get rid of NFSD_VNET macros
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 02 May 2026 21:40:05 UTC
The branch main has been updated by rmacklem:
URL: https://cgit.FreeBSD.org/src/commit/?id=821976facf746ef241e1524b44bb1de0af98fdc0
commit 821976facf746ef241e1524b44bb1de0af98fdc0
Author: Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2026-05-02 21:36:43 +0000
Commit: Rick Macklem <rmacklem@FreeBSD.org>
CommitDate: 2026-05-02 21:36:43 +0000
nfsd: Get rid of NFSD_VNET macros
When the nfsd was vnet'd, the VNET macros were hidden
behind macros that had the NFSD_ prefix on them.
This was done because, at the time, it was thought
that something other than vnet might be used for this.
That has not happened and probably will not happen,
so this patch replaces these obscuring macros with
the regular vnet ones.
There should be no semantics change caused by
this commit.
Discussed with: bz, glebius
MFC after: 1 month
---
sys/fs/nfs/nfs_commonport.c | 294 +++++++++++++++++++-------------------
sys/fs/nfs/nfs_commonsubs.c | 294 +++++++++++++++++++-------------------
sys/fs/nfs/nfsdport.h | 2 +-
sys/fs/nfs/nfsport.h | 14 --
sys/fs/nfs/nfsrvstate.h | 12 +-
sys/fs/nfsclient/nfs_clport.c | 4 +-
sys/fs/nfsserver/nfs_fha_new.c | 84 +++++------
sys/fs/nfsserver/nfs_nfsdcache.c | 134 ++++++++---------
sys/fs/nfsserver/nfs_nfsdkrpc.c | 82 +++++------
sys/fs/nfsserver/nfs_nfsdport.c | 178 +++++++++++------------
sys/fs/nfsserver/nfs_nfsdsocket.c | 66 ++++-----
sys/fs/nfsserver/nfs_nfsdstate.c | 160 ++++++++++-----------
sys/fs/nfsserver/nfs_nfsdsubs.c | 32 ++---
13 files changed, 671 insertions(+), 685 deletions(-)
diff --git a/sys/fs/nfs/nfs_commonport.c b/sys/fs/nfs/nfs_commonport.c
index 91d9188d30c5..03c6688b1406 100644
--- a/sys/fs/nfs/nfs_commonport.c
+++ b/sys/fs/nfs/nfs_commonport.c
@@ -71,10 +71,10 @@ vop_advlock_t *nfs_advlock_p = NULL;
vop_reclaim_t *nfs_reclaim_p = NULL;
uint32_t nfs_srvmaxio = NFS_SRVMAXIO;
-NFSD_VNET_DEFINE(struct nfsstatsv1 *, nfsstatsv1_p);
+VNET_DEFINE(struct nfsstatsv1 *, nfsstatsv1_p);
-NFSD_VNET_DECLARE(struct nfssockreq, nfsrv_nfsuserdsock);
-NFSD_VNET_DECLARE(nfsuserd_state, nfsrv_nfsuserd);
+VNET_DECLARE(struct nfssockreq, nfsrv_nfsuserdsock);
+VNET_DECLARE(nfsuserd_state, nfsrv_nfsuserd);
int nfs_pnfsio(task_fn_t *, void *);
@@ -428,9 +428,9 @@ nfssvc_nfscommon(struct thread *td, struct nfssvc_args *uap)
{
int error;
- NFSD_CURVNET_SET(NFSD_TD_TO_VNET(td));
+ CURVNET_SET(TD_TO_VNET(td));
error = nfssvc_call(td, uap, td->td_ucred);
- NFSD_CURVNET_RESTORE();
+ CURVNET_RESTORE();
NFSEXITCODE(error);
return (error);
}
@@ -470,105 +470,105 @@ nfssvc_call(struct thread *p, struct nfssvc_args *uap, struct ucred *cred)
if ((uap->flag & NFSSVC_NEWSTRUCT) == 0) {
/* Copy fields to the old ext_nfsstat structure. */
oldnfsstats.attrcache_hits =
- NFSD_VNET(nfsstatsv1_p)->attrcache_hits;
+ VNET(nfsstatsv1_p)->attrcache_hits;
oldnfsstats.attrcache_misses =
- NFSD_VNET(nfsstatsv1_p)->attrcache_misses;
+ VNET(nfsstatsv1_p)->attrcache_misses;
oldnfsstats.lookupcache_hits =
- NFSD_VNET(nfsstatsv1_p)->lookupcache_hits;
+ VNET(nfsstatsv1_p)->lookupcache_hits;
oldnfsstats.lookupcache_misses =
- NFSD_VNET(nfsstatsv1_p)->lookupcache_misses;
+ VNET(nfsstatsv1_p)->lookupcache_misses;
oldnfsstats.direofcache_hits =
- NFSD_VNET(nfsstatsv1_p)->direofcache_hits;
+ VNET(nfsstatsv1_p)->direofcache_hits;
oldnfsstats.direofcache_misses =
- NFSD_VNET(nfsstatsv1_p)->direofcache_misses;
+ VNET(nfsstatsv1_p)->direofcache_misses;
oldnfsstats.accesscache_hits =
- NFSD_VNET(nfsstatsv1_p)->accesscache_hits;
+ VNET(nfsstatsv1_p)->accesscache_hits;
oldnfsstats.accesscache_misses =
- NFSD_VNET(nfsstatsv1_p)->accesscache_misses;
+ VNET(nfsstatsv1_p)->accesscache_misses;
oldnfsstats.biocache_reads =
- NFSD_VNET(nfsstatsv1_p)->biocache_reads;
+ VNET(nfsstatsv1_p)->biocache_reads;
oldnfsstats.read_bios =
- NFSD_VNET(nfsstatsv1_p)->read_bios;
+ VNET(nfsstatsv1_p)->read_bios;
oldnfsstats.read_physios =
- NFSD_VNET(nfsstatsv1_p)->read_physios;
+ VNET(nfsstatsv1_p)->read_physios;
oldnfsstats.biocache_writes =
- NFSD_VNET(nfsstatsv1_p)->biocache_writes;
+ VNET(nfsstatsv1_p)->biocache_writes;
oldnfsstats.write_bios =
- NFSD_VNET(nfsstatsv1_p)->write_bios;
+ VNET(nfsstatsv1_p)->write_bios;
oldnfsstats.write_physios =
- NFSD_VNET(nfsstatsv1_p)->write_physios;
+ VNET(nfsstatsv1_p)->write_physios;
oldnfsstats.biocache_readlinks =
- NFSD_VNET(nfsstatsv1_p)->biocache_readlinks;
+ VNET(nfsstatsv1_p)->biocache_readlinks;
oldnfsstats.readlink_bios =
- NFSD_VNET(nfsstatsv1_p)->readlink_bios;
+ VNET(nfsstatsv1_p)->readlink_bios;
oldnfsstats.biocache_readdirs =
- NFSD_VNET(nfsstatsv1_p)->biocache_readdirs;
+ VNET(nfsstatsv1_p)->biocache_readdirs;
oldnfsstats.readdir_bios =
- NFSD_VNET(nfsstatsv1_p)->readdir_bios;
+ VNET(nfsstatsv1_p)->readdir_bios;
for (i = 0; i < NFSV4_NPROCS; i++)
oldnfsstats.rpccnt[i] =
- NFSD_VNET(nfsstatsv1_p)->rpccnt[i];
+ VNET(nfsstatsv1_p)->rpccnt[i];
oldnfsstats.rpcretries =
- NFSD_VNET(nfsstatsv1_p)->rpcretries;
+ VNET(nfsstatsv1_p)->rpcretries;
for (i = 0; i < NFSV4OP_NOPS; i++)
oldnfsstats.srvrpccnt[i] =
- NFSD_VNET(nfsstatsv1_p)->srvrpccnt[i];
+ VNET(nfsstatsv1_p)->srvrpccnt[i];
for (i = NFSV42_NOPS, j = NFSV4OP_NOPS;
i < NFSV42_NOPS + NFSV4OP_FAKENOPS; i++, j++)
oldnfsstats.srvrpccnt[j] =
- NFSD_VNET(nfsstatsv1_p)->srvrpccnt[i];
+ VNET(nfsstatsv1_p)->srvrpccnt[i];
oldnfsstats.reserved_0 = 0;
oldnfsstats.reserved_1 = 0;
oldnfsstats.rpcrequests =
- NFSD_VNET(nfsstatsv1_p)->rpcrequests;
+ VNET(nfsstatsv1_p)->rpcrequests;
oldnfsstats.rpctimeouts =
- NFSD_VNET(nfsstatsv1_p)->rpctimeouts;
+ VNET(nfsstatsv1_p)->rpctimeouts;
oldnfsstats.rpcunexpected =
- NFSD_VNET(nfsstatsv1_p)->rpcunexpected;
+ VNET(nfsstatsv1_p)->rpcunexpected;
oldnfsstats.rpcinvalid =
- NFSD_VNET(nfsstatsv1_p)->rpcinvalid;
+ VNET(nfsstatsv1_p)->rpcinvalid;
oldnfsstats.srvcache_inproghits =
- NFSD_VNET(nfsstatsv1_p)->srvcache_inproghits;
+ VNET(nfsstatsv1_p)->srvcache_inproghits;
oldnfsstats.reserved_2 = 0;
oldnfsstats.srvcache_nonidemdonehits =
- NFSD_VNET(nfsstatsv1_p)->srvcache_nonidemdonehits;
+ VNET(nfsstatsv1_p)->srvcache_nonidemdonehits;
oldnfsstats.srvcache_misses =
- NFSD_VNET(nfsstatsv1_p)->srvcache_misses;
+ VNET(nfsstatsv1_p)->srvcache_misses;
oldnfsstats.srvcache_tcppeak =
- NFSD_VNET(nfsstatsv1_p)->srvcache_tcppeak;
+ VNET(nfsstatsv1_p)->srvcache_tcppeak;
oldnfsstats.srvcache_size =
- NFSD_VNET(nfsstatsv1_p)->srvcache_size;
+ VNET(nfsstatsv1_p)->srvcache_size;
oldnfsstats.srvclients =
- NFSD_VNET(nfsstatsv1_p)->srvclients;
+ VNET(nfsstatsv1_p)->srvclients;
oldnfsstats.srvopenowners =
- NFSD_VNET(nfsstatsv1_p)->srvopenowners;
+ VNET(nfsstatsv1_p)->srvopenowners;
oldnfsstats.srvopens =
- NFSD_VNET(nfsstatsv1_p)->srvopens;
+ VNET(nfsstatsv1_p)->srvopens;
oldnfsstats.srvlockowners =
- NFSD_VNET(nfsstatsv1_p)->srvlockowners;
+ VNET(nfsstatsv1_p)->srvlockowners;
oldnfsstats.srvlocks =
- NFSD_VNET(nfsstatsv1_p)->srvlocks;
+ VNET(nfsstatsv1_p)->srvlocks;
oldnfsstats.srvdelegates =
- NFSD_VNET(nfsstatsv1_p)->srvdelegates;
+ VNET(nfsstatsv1_p)->srvdelegates;
for (i = 0; i < NFSV4OP_CBNOPS; i++)
oldnfsstats.cbrpccnt[i] =
- NFSD_VNET(nfsstatsv1_p)->cbrpccnt[i];
+ VNET(nfsstatsv1_p)->cbrpccnt[i];
oldnfsstats.clopenowners =
- NFSD_VNET(nfsstatsv1_p)->clopenowners;
- oldnfsstats.clopens = NFSD_VNET(nfsstatsv1_p)->clopens;
+ VNET(nfsstatsv1_p)->clopenowners;
+ oldnfsstats.clopens = VNET(nfsstatsv1_p)->clopens;
oldnfsstats.cllockowners =
- NFSD_VNET(nfsstatsv1_p)->cllockowners;
- oldnfsstats.cllocks = NFSD_VNET(nfsstatsv1_p)->cllocks;
+ VNET(nfsstatsv1_p)->cllockowners;
+ oldnfsstats.cllocks = VNET(nfsstatsv1_p)->cllocks;
oldnfsstats.cldelegates =
- NFSD_VNET(nfsstatsv1_p)->cldelegates;
+ VNET(nfsstatsv1_p)->cldelegates;
oldnfsstats.cllocalopenowners =
- NFSD_VNET(nfsstatsv1_p)->cllocalopenowners;
+ VNET(nfsstatsv1_p)->cllocalopenowners;
oldnfsstats.cllocalopens =
- NFSD_VNET(nfsstatsv1_p)->cllocalopens;
+ VNET(nfsstatsv1_p)->cllocalopens;
oldnfsstats.cllocallockowners =
- NFSD_VNET(nfsstatsv1_p)->cllocallockowners;
+ VNET(nfsstatsv1_p)->cllocallockowners;
oldnfsstats.cllocallocks =
- NFSD_VNET(nfsstatsv1_p)->cllocallocks;
+ VNET(nfsstatsv1_p)->cllocallocks;
error = copyout(&oldnfsstats, uap->argp,
sizeof (oldnfsstats));
} else {
@@ -578,174 +578,174 @@ nfssvc_call(struct thread *p, struct nfssvc_args *uap, struct ucred *cred)
if (nfsstatver.vers == NFSSTATS_OV1) {
/* Copy nfsstatsv1 to nfsstatsov1. */
nfsstatsov1.attrcache_hits =
- NFSD_VNET(nfsstatsv1_p)->attrcache_hits;
+ VNET(nfsstatsv1_p)->attrcache_hits;
nfsstatsov1.attrcache_misses =
- NFSD_VNET(nfsstatsv1_p)->attrcache_misses;
+ VNET(nfsstatsv1_p)->attrcache_misses;
nfsstatsov1.lookupcache_hits =
- NFSD_VNET(nfsstatsv1_p)->lookupcache_hits;
+ VNET(nfsstatsv1_p)->lookupcache_hits;
nfsstatsov1.lookupcache_misses =
- NFSD_VNET(nfsstatsv1_p)->lookupcache_misses;
+ VNET(nfsstatsv1_p)->lookupcache_misses;
nfsstatsov1.direofcache_hits =
- NFSD_VNET(nfsstatsv1_p)->direofcache_hits;
+ VNET(nfsstatsv1_p)->direofcache_hits;
nfsstatsov1.direofcache_misses =
- NFSD_VNET(nfsstatsv1_p)->direofcache_misses;
+ VNET(nfsstatsv1_p)->direofcache_misses;
nfsstatsov1.accesscache_hits =
- NFSD_VNET(nfsstatsv1_p)->accesscache_hits;
+ VNET(nfsstatsv1_p)->accesscache_hits;
nfsstatsov1.accesscache_misses =
- NFSD_VNET(nfsstatsv1_p)->accesscache_misses;
+ VNET(nfsstatsv1_p)->accesscache_misses;
nfsstatsov1.biocache_reads =
- NFSD_VNET(nfsstatsv1_p)->biocache_reads;
+ VNET(nfsstatsv1_p)->biocache_reads;
nfsstatsov1.read_bios =
- NFSD_VNET(nfsstatsv1_p)->read_bios;
+ VNET(nfsstatsv1_p)->read_bios;
nfsstatsov1.read_physios =
- NFSD_VNET(nfsstatsv1_p)->read_physios;
+ VNET(nfsstatsv1_p)->read_physios;
nfsstatsov1.biocache_writes =
- NFSD_VNET(nfsstatsv1_p)->biocache_writes;
+ VNET(nfsstatsv1_p)->biocache_writes;
nfsstatsov1.write_bios =
- NFSD_VNET(nfsstatsv1_p)->write_bios;
+ VNET(nfsstatsv1_p)->write_bios;
nfsstatsov1.write_physios =
- NFSD_VNET(nfsstatsv1_p)->write_physios;
+ VNET(nfsstatsv1_p)->write_physios;
nfsstatsov1.biocache_readlinks =
- NFSD_VNET(nfsstatsv1_p)->biocache_readlinks;
+ VNET(nfsstatsv1_p)->biocache_readlinks;
nfsstatsov1.readlink_bios =
- NFSD_VNET(nfsstatsv1_p)->readlink_bios;
+ VNET(nfsstatsv1_p)->readlink_bios;
nfsstatsov1.biocache_readdirs =
- NFSD_VNET(nfsstatsv1_p)->biocache_readdirs;
+ VNET(nfsstatsv1_p)->biocache_readdirs;
nfsstatsov1.readdir_bios =
- NFSD_VNET(nfsstatsv1_p)->readdir_bios;
+ VNET(nfsstatsv1_p)->readdir_bios;
for (i = 0; i < NFSV42_OLDNPROCS; i++)
nfsstatsov1.rpccnt[i] =
- NFSD_VNET(nfsstatsv1_p)->rpccnt[i];
+ VNET(nfsstatsv1_p)->rpccnt[i];
nfsstatsov1.rpcretries =
- NFSD_VNET(nfsstatsv1_p)->rpcretries;
+ VNET(nfsstatsv1_p)->rpcretries;
for (i = 0; i < NFSV42_PURENOPS; i++)
nfsstatsov1.srvrpccnt[i] =
- NFSD_VNET(nfsstatsv1_p)->srvrpccnt[i];
+ VNET(nfsstatsv1_p)->srvrpccnt[i];
for (i = NFSV42_NOPS,
j = NFSV42_PURENOPS;
i < NFSV42_NOPS + NFSV4OP_FAKENOPS;
i++, j++)
nfsstatsov1.srvrpccnt[j] =
- NFSD_VNET(nfsstatsv1_p)->srvrpccnt[i];
+ VNET(nfsstatsv1_p)->srvrpccnt[i];
nfsstatsov1.reserved_0 = 0;
nfsstatsov1.reserved_1 = 0;
nfsstatsov1.rpcrequests =
- NFSD_VNET(nfsstatsv1_p)->rpcrequests;
+ VNET(nfsstatsv1_p)->rpcrequests;
nfsstatsov1.rpctimeouts =
- NFSD_VNET(nfsstatsv1_p)->rpctimeouts;
+ VNET(nfsstatsv1_p)->rpctimeouts;
nfsstatsov1.rpcunexpected =
- NFSD_VNET(nfsstatsv1_p)->rpcunexpected;
+ VNET(nfsstatsv1_p)->rpcunexpected;
nfsstatsov1.rpcinvalid =
- NFSD_VNET(nfsstatsv1_p)->rpcinvalid;
+ VNET(nfsstatsv1_p)->rpcinvalid;
nfsstatsov1.srvcache_inproghits =
- NFSD_VNET(nfsstatsv1_p)->srvcache_inproghits;
+ VNET(nfsstatsv1_p)->srvcache_inproghits;
nfsstatsov1.reserved_2 = 0;
nfsstatsov1.srvcache_nonidemdonehits =
- NFSD_VNET(nfsstatsv1_p)->srvcache_nonidemdonehits;
+ VNET(nfsstatsv1_p)->srvcache_nonidemdonehits;
nfsstatsov1.srvcache_misses =
- NFSD_VNET(nfsstatsv1_p)->srvcache_misses;
+ VNET(nfsstatsv1_p)->srvcache_misses;
nfsstatsov1.srvcache_tcppeak =
- NFSD_VNET(nfsstatsv1_p)->srvcache_tcppeak;
+ VNET(nfsstatsv1_p)->srvcache_tcppeak;
nfsstatsov1.srvcache_size =
- NFSD_VNET(nfsstatsv1_p)->srvcache_size;
+ VNET(nfsstatsv1_p)->srvcache_size;
nfsstatsov1.srvclients =
- NFSD_VNET(nfsstatsv1_p)->srvclients;
+ VNET(nfsstatsv1_p)->srvclients;
nfsstatsov1.srvopenowners =
- NFSD_VNET(nfsstatsv1_p)->srvopenowners;
+ VNET(nfsstatsv1_p)->srvopenowners;
nfsstatsov1.srvopens =
- NFSD_VNET(nfsstatsv1_p)->srvopens;
+ VNET(nfsstatsv1_p)->srvopens;
nfsstatsov1.srvlockowners =
- NFSD_VNET(nfsstatsv1_p)->srvlockowners;
+ VNET(nfsstatsv1_p)->srvlockowners;
nfsstatsov1.srvlocks =
- NFSD_VNET(nfsstatsv1_p)->srvlocks;
+ VNET(nfsstatsv1_p)->srvlocks;
nfsstatsov1.srvdelegates =
- NFSD_VNET(nfsstatsv1_p)->srvdelegates;
+ VNET(nfsstatsv1_p)->srvdelegates;
for (i = 0; i < NFSV42_CBNOPS; i++)
nfsstatsov1.cbrpccnt[i] =
- NFSD_VNET(nfsstatsv1_p)->cbrpccnt[i];
+ VNET(nfsstatsv1_p)->cbrpccnt[i];
nfsstatsov1.clopenowners =
- NFSD_VNET(nfsstatsv1_p)->clopenowners;
+ VNET(nfsstatsv1_p)->clopenowners;
nfsstatsov1.clopens =
- NFSD_VNET(nfsstatsv1_p)->clopens;
+ VNET(nfsstatsv1_p)->clopens;
nfsstatsov1.cllockowners =
- NFSD_VNET(nfsstatsv1_p)->cllockowners;
+ VNET(nfsstatsv1_p)->cllockowners;
nfsstatsov1.cllocks =
- NFSD_VNET(nfsstatsv1_p)->cllocks;
+ VNET(nfsstatsv1_p)->cllocks;
nfsstatsov1.cldelegates =
- NFSD_VNET(nfsstatsv1_p)->cldelegates;
+ VNET(nfsstatsv1_p)->cldelegates;
nfsstatsov1.cllocalopenowners =
- NFSD_VNET(nfsstatsv1_p)->cllocalopenowners;
+ VNET(nfsstatsv1_p)->cllocalopenowners;
nfsstatsov1.cllocalopens =
- NFSD_VNET(nfsstatsv1_p)->cllocalopens;
+ VNET(nfsstatsv1_p)->cllocalopens;
nfsstatsov1.cllocallockowners =
- NFSD_VNET(nfsstatsv1_p)->cllocallockowners;
+ VNET(nfsstatsv1_p)->cllocallockowners;
nfsstatsov1.cllocallocks =
- NFSD_VNET(nfsstatsv1_p)->cllocallocks;
+ VNET(nfsstatsv1_p)->cllocallocks;
nfsstatsov1.srvstartcnt =
- NFSD_VNET(nfsstatsv1_p)->srvstartcnt;
+ VNET(nfsstatsv1_p)->srvstartcnt;
nfsstatsov1.srvdonecnt =
- NFSD_VNET(nfsstatsv1_p)->srvdonecnt;
+ VNET(nfsstatsv1_p)->srvdonecnt;
for (i = NFSV42_NOPS,
j = NFSV42_PURENOPS;
i < NFSV42_NOPS + NFSV4OP_FAKENOPS;
i++, j++) {
nfsstatsov1.srvbytes[j] =
- NFSD_VNET(nfsstatsv1_p)->srvbytes[i];
+ VNET(nfsstatsv1_p)->srvbytes[i];
nfsstatsov1.srvops[j] =
- NFSD_VNET(nfsstatsv1_p)->srvops[i];
+ VNET(nfsstatsv1_p)->srvops[i];
nfsstatsov1.srvduration[j] =
- NFSD_VNET(nfsstatsv1_p)->srvduration[i];
+ VNET(nfsstatsv1_p)->srvduration[i];
}
nfsstatsov1.busyfrom =
- NFSD_VNET(nfsstatsv1_p)->busyfrom;
+ VNET(nfsstatsv1_p)->busyfrom;
nfsstatsov1.busyfrom =
- NFSD_VNET(nfsstatsv1_p)->busyfrom;
+ VNET(nfsstatsv1_p)->busyfrom;
error = copyout(&nfsstatsov1, uap->argp,
sizeof(nfsstatsov1));
} else if (nfsstatver.vers != NFSSTATS_V1)
error = EPERM;
else
- error = copyout(NFSD_VNET(nfsstatsv1_p),
+ error = copyout(VNET(nfsstatsv1_p),
uap->argp, sizeof(nfsstatsv1));
}
}
if (error == 0) {
if ((uap->flag & NFSSVC_ZEROCLTSTATS) != 0) {
- NFSD_VNET(nfsstatsv1_p)->attrcache_hits = 0;
- NFSD_VNET(nfsstatsv1_p)->attrcache_misses = 0;
- NFSD_VNET(nfsstatsv1_p)->lookupcache_hits = 0;
- NFSD_VNET(nfsstatsv1_p)->lookupcache_misses = 0;
- NFSD_VNET(nfsstatsv1_p)->direofcache_hits = 0;
- NFSD_VNET(nfsstatsv1_p)->direofcache_misses = 0;
- NFSD_VNET(nfsstatsv1_p)->accesscache_hits = 0;
- NFSD_VNET(nfsstatsv1_p)->accesscache_misses = 0;
- NFSD_VNET(nfsstatsv1_p)->biocache_reads = 0;
- NFSD_VNET(nfsstatsv1_p)->read_bios = 0;
- NFSD_VNET(nfsstatsv1_p)->read_physios = 0;
- NFSD_VNET(nfsstatsv1_p)->biocache_writes = 0;
- NFSD_VNET(nfsstatsv1_p)->write_bios = 0;
- NFSD_VNET(nfsstatsv1_p)->write_physios = 0;
- NFSD_VNET(nfsstatsv1_p)->biocache_readlinks = 0;
- NFSD_VNET(nfsstatsv1_p)->readlink_bios = 0;
- NFSD_VNET(nfsstatsv1_p)->biocache_readdirs = 0;
- NFSD_VNET(nfsstatsv1_p)->readdir_bios = 0;
- NFSD_VNET(nfsstatsv1_p)->rpcretries = 0;
- NFSD_VNET(nfsstatsv1_p)->rpcrequests = 0;
- NFSD_VNET(nfsstatsv1_p)->rpctimeouts = 0;
- NFSD_VNET(nfsstatsv1_p)->rpcunexpected = 0;
- NFSD_VNET(nfsstatsv1_p)->rpcinvalid = 0;
- bzero(NFSD_VNET(nfsstatsv1_p)->rpccnt,
- sizeof(NFSD_VNET(nfsstatsv1_p)->rpccnt));
+ VNET(nfsstatsv1_p)->attrcache_hits = 0;
+ VNET(nfsstatsv1_p)->attrcache_misses = 0;
+ VNET(nfsstatsv1_p)->lookupcache_hits = 0;
+ VNET(nfsstatsv1_p)->lookupcache_misses = 0;
+ VNET(nfsstatsv1_p)->direofcache_hits = 0;
+ VNET(nfsstatsv1_p)->direofcache_misses = 0;
+ VNET(nfsstatsv1_p)->accesscache_hits = 0;
+ VNET(nfsstatsv1_p)->accesscache_misses = 0;
+ VNET(nfsstatsv1_p)->biocache_reads = 0;
+ VNET(nfsstatsv1_p)->read_bios = 0;
+ VNET(nfsstatsv1_p)->read_physios = 0;
+ VNET(nfsstatsv1_p)->biocache_writes = 0;
+ VNET(nfsstatsv1_p)->write_bios = 0;
+ VNET(nfsstatsv1_p)->write_physios = 0;
+ VNET(nfsstatsv1_p)->biocache_readlinks = 0;
+ VNET(nfsstatsv1_p)->readlink_bios = 0;
+ VNET(nfsstatsv1_p)->biocache_readdirs = 0;
+ VNET(nfsstatsv1_p)->readdir_bios = 0;
+ VNET(nfsstatsv1_p)->rpcretries = 0;
+ VNET(nfsstatsv1_p)->rpcrequests = 0;
+ VNET(nfsstatsv1_p)->rpctimeouts = 0;
+ VNET(nfsstatsv1_p)->rpcunexpected = 0;
+ VNET(nfsstatsv1_p)->rpcinvalid = 0;
+ bzero(VNET(nfsstatsv1_p)->rpccnt,
+ sizeof(VNET(nfsstatsv1_p)->rpccnt));
}
if ((uap->flag & NFSSVC_ZEROSRVSTATS) != 0) {
- NFSD_VNET(nfsstatsv1_p)->srvcache_inproghits = 0;
- NFSD_VNET(nfsstatsv1_p)->srvcache_nonidemdonehits = 0;
- NFSD_VNET(nfsstatsv1_p)->srvcache_misses = 0;
- NFSD_VNET(nfsstatsv1_p)->srvcache_tcppeak = 0;
- bzero(NFSD_VNET(nfsstatsv1_p)->srvrpccnt,
- sizeof(NFSD_VNET(nfsstatsv1_p)->srvrpccnt));
- bzero(NFSD_VNET(nfsstatsv1_p)->cbrpccnt,
- sizeof(NFSD_VNET(nfsstatsv1_p)->cbrpccnt));
+ VNET(nfsstatsv1_p)->srvcache_inproghits = 0;
+ VNET(nfsstatsv1_p)->srvcache_nonidemdonehits = 0;
+ VNET(nfsstatsv1_p)->srvcache_misses = 0;
+ VNET(nfsstatsv1_p)->srvcache_tcppeak = 0;
+ bzero(VNET(nfsstatsv1_p)->srvrpccnt,
+ sizeof(VNET(nfsstatsv1_p)->srvrpccnt));
+ bzero(VNET(nfsstatsv1_p)->cbrpccnt,
+ sizeof(VNET(nfsstatsv1_p)->cbrpccnt));
}
}
goto out;
@@ -891,11 +891,11 @@ nfs_vnetinit(const void *unused __unused)
{
if (IS_DEFAULT_VNET(curvnet))
- NFSD_VNET(nfsstatsv1_p) = &nfsstatsv1;
+ VNET(nfsstatsv1_p) = &nfsstatsv1;
else
- NFSD_VNET(nfsstatsv1_p) = malloc(sizeof(struct nfsstatsv1),
+ VNET(nfsstatsv1_p) = malloc(sizeof(struct nfsstatsv1),
M_TEMP, M_WAITOK | M_ZERO);
- mtx_init(&NFSD_VNET(nfsrv_nfsuserdsock).nr_mtx, "nfsuserd",
+ mtx_init(&VNET(nfsrv_nfsuserdsock).nr_mtx, "nfsuserd",
NULL, MTX_DEF);
}
VNET_SYSINIT(nfs_vnetinit, SI_SUB_VNET_DONE, SI_ORDER_FIRST,
@@ -905,10 +905,10 @@ static void
nfs_cleanup(void *unused __unused)
{
- mtx_destroy(&NFSD_VNET(nfsrv_nfsuserdsock).nr_mtx);
+ mtx_destroy(&VNET(nfsrv_nfsuserdsock).nr_mtx);
if (!IS_DEFAULT_VNET(curvnet)) {
- free(NFSD_VNET(nfsstatsv1_p), M_TEMP);
- NFSD_VNET(nfsstatsv1_p) = NULL;
+ free(VNET(nfsstatsv1_p), M_TEMP);
+ VNET(nfsstatsv1_p) = NULL;
}
/* Clean out the name<-->id cache. */
nfsrv_cleanusergroup();
@@ -945,7 +945,7 @@ nfscommon_modevent(module_t mod, int type, void *data)
case MOD_UNLOAD:
if (newnfs_numnfsd != 0 ||
- NFSD_VNET(nfsrv_nfsuserd) != NOTRUNNING ||
+ VNET(nfsrv_nfsuserd) != NOTRUNNING ||
nfs_numnfscbd != 0) {
error = EBUSY;
break;
diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c
index 0b7c15a0b54e..b5f83a98b307 100644
--- a/sys/fs/nfs/nfs_commonsubs.c
+++ b/sys/fs/nfs/nfs_commonsubs.c
@@ -96,19 +96,19 @@ struct nfs_prime_userd nfs_prime_userd[] = {
{ 0, 0, 0, NULL },
};
-NFSD_VNET_DEFINE(int, nfsd_enable_stringtouid) = 0;
-NFSD_VNET_DEFINE(struct nfssockreq, nfsrv_nfsuserdsock);
-NFSD_VNET_DEFINE(nfsuserd_state, nfsrv_nfsuserd) = NOTRUNNING;
-NFSD_VNET_DEFINE(uid_t, nfsrv_defaultuid) = UID_NOBODY;
-NFSD_VNET_DEFINE(gid_t, nfsrv_defaultgid) = GID_NOGROUP;
+VNET_DEFINE(int, nfsd_enable_stringtouid) = 0;
+VNET_DEFINE(struct nfssockreq, nfsrv_nfsuserdsock);
+VNET_DEFINE(nfsuserd_state, nfsrv_nfsuserd) = NOTRUNNING;
+VNET_DEFINE(uid_t, nfsrv_defaultuid) = UID_NOBODY;
+VNET_DEFINE(gid_t, nfsrv_defaultgid) = GID_NOGROUP;
-NFSD_VNET_DEFINE_STATIC(int, nfsrv_userdupcalls) = 0;
+VNET_DEFINE_STATIC(int, nfsrv_userdupcalls) = 0;
SYSCTL_DECL(_vfs_nfs);
-NFSD_VNET_DEFINE_STATIC(int, nfs_enable_uidtostring) = 0;
+VNET_DEFINE_STATIC(int, nfs_enable_uidtostring) = 0;
SYSCTL_INT(_vfs_nfs, OID_AUTO, enable_uidtostring,
- CTLFLAG_NFSD_VNET | CTLFLAG_RW, &NFSD_VNET_NAME(nfs_enable_uidtostring), 0,
+ CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nfs_enable_uidtostring), 0,
"Make nfs always send numeric owner_names");
int nfsrv_maxpnfsmirror = 1;
@@ -216,14 +216,14 @@ struct nfsrv_lughash {
struct nfsuserhashhead lughead;
};
-NFSD_VNET_DEFINE_STATIC(int, nfsrv_usercnt) = 0;
-NFSD_VNET_DEFINE_STATIC(int, nfsrv_dnsnamelen) = 0;
-NFSD_VNET_DEFINE_STATIC(int, nfsrv_usermax) = 999999999;
-NFSD_VNET_DEFINE_STATIC(struct nfsrv_lughash *, nfsuserhash) = NULL;
-NFSD_VNET_DEFINE_STATIC(struct nfsrv_lughash *, nfsusernamehash) = NULL;
-NFSD_VNET_DEFINE_STATIC(struct nfsrv_lughash *, nfsgrouphash) = NULL;
-NFSD_VNET_DEFINE_STATIC(struct nfsrv_lughash *, nfsgroupnamehash) = NULL;
-NFSD_VNET_DEFINE_STATIC(u_char *, nfsrv_dnsname) = NULL;
+VNET_DEFINE_STATIC(int, nfsrv_usercnt) = 0;
+VNET_DEFINE_STATIC(int, nfsrv_dnsnamelen) = 0;
+VNET_DEFINE_STATIC(int, nfsrv_usermax) = 999999999;
+VNET_DEFINE_STATIC(struct nfsrv_lughash *, nfsuserhash) = NULL;
+VNET_DEFINE_STATIC(struct nfsrv_lughash *, nfsusernamehash) = NULL;
+VNET_DEFINE_STATIC(struct nfsrv_lughash *, nfsgrouphash) = NULL;
+VNET_DEFINE_STATIC(struct nfsrv_lughash *, nfsgroupnamehash) = NULL;
+VNET_DEFINE_STATIC(u_char *, nfsrv_dnsname) = NULL;
/*
* This static array indicates whether or not the RPC generates a large
@@ -1369,7 +1369,7 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
#endif
CTASSERT(sizeof(ino_t) == sizeof(uint64_t));
- NFSD_CURVNET_SET_QUIET(NFSD_TD_TO_VNET(curthread));
+ CURVNET_SET_QUIET(TD_TO_VNET(curthread));
if (compare) {
retnotsup = 0;
error = nfsrv_getattrbits(nd, &attrbits, NULL, &retnotsup);
@@ -2064,7 +2064,7 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
} else if (nap != NULL) {
if (nfsv4_strtouid(nd, cp, j, &uid))
nap->na_uid =
- NFSD_VNET(nfsrv_defaultuid);
+ VNET(nfsrv_defaultuid);
else
nap->na_uid = uid;
}
@@ -2098,7 +2098,7 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
} else if (nap != NULL) {
if (nfsv4_strtogid(nd, cp, j, &gid))
nap->na_gid =
- NFSD_VNET(nfsrv_defaultgid);
+ VNET(nfsrv_defaultgid);
else
nap->na_gid = gid;
}
@@ -2602,7 +2602,7 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
error = nfsm_advance(nd, attrsize - attrsum, -1);
}
nfsmout:
- NFSD_CURVNET_RESTORE();
+ CURVNET_RESTORE();
NFSEXITCODE2(error, nd);
return (error);
}
@@ -3652,16 +3652,16 @@ nfsv4_uidtostr(uid_t uid, u_char **cpp, int *retlenp)
int cnt, hasampersand, len = NFSV4_SMALLSTR, ret;
struct nfsrv_lughash *hp;
- NFSD_CURVNET_SET_QUIET(NFSD_TD_TO_VNET(curthread));
+ CURVNET_SET_QUIET(TD_TO_VNET(curthread));
cnt = 0;
tryagain:
- if (NFSD_VNET(nfsrv_dnsnamelen) > 0 &&
- !NFSD_VNET(nfs_enable_uidtostring)) {
+ if (VNET(nfsrv_dnsnamelen) > 0 &&
+ !VNET(nfs_enable_uidtostring)) {
/*
* Always map nfsrv_defaultuid to "nobody".
*/
- if (uid == NFSD_VNET(nfsrv_defaultuid)) {
- i = NFSD_VNET(nfsrv_dnsnamelen) + 7;
+ if (uid == VNET(nfsrv_defaultuid)) {
+ i = VNET(nfsrv_dnsnamelen) + 7;
if (i > len) {
if (len > NFSV4_SMALLSTR)
free(cp, M_NFSSTRING);
@@ -3673,9 +3673,9 @@ tryagain:
*retlenp = i;
NFSBCOPY("nobody@", cp, 7);
cp += 7;
- NFSBCOPY(NFSD_VNET(nfsrv_dnsname), cp,
- NFSD_VNET(nfsrv_dnsnamelen));
- NFSD_CURVNET_RESTORE();
+ NFSBCOPY(VNET(nfsrv_dnsname), cp,
+ VNET(nfsrv_dnsnamelen));
+ CURVNET_RESTORE();
return;
}
hasampersand = 0;
@@ -3700,7 +3700,7 @@ tryagain:
i = usrp->lug_namelen;
else
i = usrp->lug_namelen +
- NFSD_VNET(nfsrv_dnsnamelen) + 1;
+ VNET(nfsrv_dnsnamelen) + 1;
if (i > len) {
mtx_unlock(&hp->mtx);
if (len > NFSV4_SMALLSTR)
@@ -3715,14 +3715,14 @@ tryagain:
if (!hasampersand) {
cp += usrp->lug_namelen;
*cp++ = '@';
- NFSBCOPY(NFSD_VNET(nfsrv_dnsname), cp,
- NFSD_VNET(nfsrv_dnsnamelen));
+ NFSBCOPY(VNET(nfsrv_dnsname), cp,
+ VNET(nfsrv_dnsnamelen));
}
TAILQ_REMOVE(&hp->lughead, usrp, lug_numhash);
TAILQ_INSERT_TAIL(&hp->lughead, usrp,
lug_numhash);
mtx_unlock(&hp->mtx);
- NFSD_CURVNET_RESTORE();
+ CURVNET_RESTORE();
return;
}
}
@@ -3750,7 +3750,7 @@ tryagain:
*cp-- = '0' + (tmp % 10);
tmp /= 10;
}
- NFSD_CURVNET_RESTORE();
+ CURVNET_RESTORE();
return;
}
@@ -3771,7 +3771,7 @@ nfsrv_getgrpscred(struct ucred *oldcred)
cnt = 0;
uid = oldcred->cr_uid;
tryagain:
- if (NFSD_VNET(nfsrv_dnsnamelen) > 0) {
+ if (VNET(nfsrv_dnsnamelen) > 0) {
hp = NFSUSERHASH(uid);
mtx_lock(&hp->mtx);
TAILQ_FOREACH(usrp, &hp->lughead, lug_numhash) {
@@ -3819,7 +3819,7 @@ nfsv4_strtouid(struct nfsrv_descript *nd, u_char *str, int len, uid_t *uidp)
uid_t tuid;
struct nfsrv_lughash *hp, *hp2;
- NFSD_CURVNET_SET_QUIET(NFSD_TD_TO_VNET(curthread));
+ CURVNET_SET_QUIET(TD_TO_VNET(curthread));
if (len == 0) {
error = NFSERR_BADOWNER;
goto out;
@@ -3831,7 +3831,7 @@ nfsv4_strtouid(struct nfsrv_descript *nd, u_char *str, int len, uid_t *uidp)
/* A numeric string. */
if ((nd->nd_flag & ND_KERBV) == 0 &&
((nd->nd_flag & ND_NFSCL) != 0 ||
- NFSD_VNET(nfsd_enable_stringtouid) != 0))
+ VNET(nfsd_enable_stringtouid) != 0))
*uidp = tuid;
else
error = NFSERR_BADOWNER;
@@ -3848,7 +3848,7 @@ nfsv4_strtouid(struct nfsrv_descript *nd, u_char *str, int len, uid_t *uidp)
cnt = 0;
tryagain:
- if (NFSD_VNET(nfsrv_dnsnamelen) > 0) {
+ if (VNET(nfsrv_dnsnamelen) > 0) {
/*
* If an '@' is found and the domain name matches, search for
* the name with dns stripped off.
@@ -3856,10 +3856,10 @@ tryagain:
* since RFC8881 defines this string as a DNS domain name.
*/
if (cnt == 0 && i < len && i > 0 &&
- (len - 1 - i) == NFSD_VNET(nfsrv_dnsnamelen) &&
- strncasecmp(cp, NFSD_VNET(nfsrv_dnsname),
- NFSD_VNET(nfsrv_dnsnamelen)) == 0) {
- len -= (NFSD_VNET(nfsrv_dnsnamelen) + 1);
+ (len - 1 - i) == VNET(nfsrv_dnsnamelen) &&
+ strncasecmp(cp, VNET(nfsrv_dnsname),
+ VNET(nfsrv_dnsnamelen)) == 0) {
+ len -= (VNET(nfsrv_dnsnamelen) + 1);
*(cp - 1) = '\0';
}
@@ -3867,7 +3867,7 @@ tryagain:
* Check for the special case of "nobody".
*/
if (len == 6 && !NFSBCMP(str, "nobody", 6)) {
- *uidp = NFSD_VNET(nfsrv_defaultuid);
+ *uidp = VNET(nfsrv_defaultuid);
error = 0;
goto out;
}
@@ -3902,7 +3902,7 @@ tryagain:
error = NFSERR_BADOWNER;
out:
- NFSD_CURVNET_RESTORE();
+ CURVNET_RESTORE();
NFSEXITCODE(error);
return (error);
}
@@ -3924,16 +3924,16 @@ nfsv4_gidtostr(gid_t gid, u_char **cpp, int *retlenp)
int cnt, hasampersand, len = NFSV4_SMALLSTR, ret;
struct nfsrv_lughash *hp;
- NFSD_CURVNET_SET_QUIET(NFSD_TD_TO_VNET(curthread));
+ CURVNET_SET_QUIET(TD_TO_VNET(curthread));
cnt = 0;
tryagain:
- if (NFSD_VNET(nfsrv_dnsnamelen) > 0 &&
- !NFSD_VNET(nfs_enable_uidtostring)) {
+ if (VNET(nfsrv_dnsnamelen) > 0 &&
+ !VNET(nfs_enable_uidtostring)) {
/*
* Always map nfsrv_defaultgid to "nogroup".
*/
- if (gid == NFSD_VNET(nfsrv_defaultgid)) {
- i = NFSD_VNET(nfsrv_dnsnamelen) + 8;
+ if (gid == VNET(nfsrv_defaultgid)) {
+ i = VNET(nfsrv_dnsnamelen) + 8;
if (i > len) {
if (len > NFSV4_SMALLSTR)
free(cp, M_NFSSTRING);
@@ -3945,9 +3945,9 @@ tryagain:
*retlenp = i;
NFSBCOPY("nogroup@", cp, 8);
cp += 8;
- NFSBCOPY(NFSD_VNET(nfsrv_dnsname), cp,
- NFSD_VNET(nfsrv_dnsnamelen));
- NFSD_CURVNET_RESTORE();
+ NFSBCOPY(VNET(nfsrv_dnsname), cp,
+ VNET(nfsrv_dnsnamelen));
+ CURVNET_RESTORE();
return;
}
hasampersand = 0;
@@ -3972,7 +3972,7 @@ tryagain:
i = usrp->lug_namelen;
else
i = usrp->lug_namelen +
- NFSD_VNET(nfsrv_dnsnamelen) + 1;
+ VNET(nfsrv_dnsnamelen) + 1;
if (i > len) {
mtx_unlock(&hp->mtx);
if (len > NFSV4_SMALLSTR)
@@ -3987,14 +3987,14 @@ tryagain:
if (!hasampersand) {
cp += usrp->lug_namelen;
*cp++ = '@';
- NFSBCOPY(NFSD_VNET(nfsrv_dnsname), cp,
- NFSD_VNET(nfsrv_dnsnamelen));
+ NFSBCOPY(VNET(nfsrv_dnsname), cp,
+ VNET(nfsrv_dnsnamelen));
}
TAILQ_REMOVE(&hp->lughead, usrp, lug_numhash);
TAILQ_INSERT_TAIL(&hp->lughead, usrp,
lug_numhash);
mtx_unlock(&hp->mtx);
- NFSD_CURVNET_RESTORE();
+ CURVNET_RESTORE();
return;
}
}
@@ -4022,7 +4022,7 @@ tryagain:
*cp-- = '0' + (tmp % 10);
tmp /= 10;
}
- NFSD_CURVNET_RESTORE();
+ CURVNET_RESTORE();
return;
}
@@ -4045,7 +4045,7 @@ nfsv4_strtogid(struct nfsrv_descript *nd, u_char *str, int len, gid_t *gidp)
gid_t tgid;
struct nfsrv_lughash *hp, *hp2;
- NFSD_CURVNET_SET_QUIET(NFSD_TD_TO_VNET(curthread));
+ CURVNET_SET_QUIET(TD_TO_VNET(curthread));
if (len == 0) {
error = NFSERR_BADOWNER;
goto out;
@@ -4057,7 +4057,7 @@ nfsv4_strtogid(struct nfsrv_descript *nd, u_char *str, int len, gid_t *gidp)
/* A numeric string. */
if ((nd->nd_flag & ND_KERBV) == 0 &&
((nd->nd_flag & ND_NFSCL) != 0 ||
- NFSD_VNET(nfsd_enable_stringtouid) != 0))
+ VNET(nfsd_enable_stringtouid) != 0))
*gidp = tgid;
else
error = NFSERR_BADOWNER;
@@ -4074,16 +4074,16 @@ nfsv4_strtogid(struct nfsrv_descript *nd, u_char *str, int len, gid_t *gidp)
cnt = 0;
tryagain:
- if (NFSD_VNET(nfsrv_dnsnamelen) > 0) {
+ if (VNET(nfsrv_dnsnamelen) > 0) {
/*
* If an '@' is found and the dns name matches, search for the
* name with the dns stripped off.
*/
if (cnt == 0 && i < len && i > 0 &&
- (len - 1 - i) == NFSD_VNET(nfsrv_dnsnamelen) &&
- strncasecmp(cp, NFSD_VNET(nfsrv_dnsname),
- NFSD_VNET(nfsrv_dnsnamelen)) == 0) {
- len -= (NFSD_VNET(nfsrv_dnsnamelen) + 1);
+ (len - 1 - i) == VNET(nfsrv_dnsnamelen) &&
+ strncasecmp(cp, VNET(nfsrv_dnsname),
+ VNET(nfsrv_dnsnamelen)) == 0) {
+ len -= (VNET(nfsrv_dnsnamelen) + 1);
*(cp - 1) = '\0';
}
@@ -4091,7 +4091,7 @@ tryagain:
* Check for the special case of "nogroup".
*/
if (len == 7 && !NFSBCMP(str, "nogroup", 7)) {
- *gidp = NFSD_VNET(nfsrv_defaultgid);
+ *gidp = VNET(nfsrv_defaultgid);
error = 0;
goto out;
}
@@ -4126,7 +4126,7 @@ tryagain:
error = NFSERR_BADOWNER;
out:
- NFSD_CURVNET_RESTORE();
+ CURVNET_RESTORE();
NFSEXITCODE(error);
return (error);
}
@@ -4148,12 +4148,12 @@ nfsrv_nfsuserdport(struct nfsuserd_args *nargs, NFSPROC_T *p)
int error;
NFSLOCKNAMEID();
- if (NFSD_VNET(nfsrv_nfsuserd) != NOTRUNNING) {
+ if (VNET(nfsrv_nfsuserd) != NOTRUNNING) {
NFSUNLOCKNAMEID();
error = EPERM;
goto out;
}
- NFSD_VNET(nfsrv_nfsuserd) = STARTSTOP;
+ VNET(nfsrv_nfsuserd) = STARTSTOP;
/*
* Set up the socket record and connect.
* Set nr_client NULL before unlocking, just to ensure that no other
@@ -4161,7 +4161,7 @@ nfsrv_nfsuserdport(struct nfsuserd_args *nargs, NFSPROC_T *p)
* occur if the use of the nameid lock to protect nfsrv_nfsuserd is
* broken.
*/
- rp = &NFSD_VNET(nfsrv_nfsuserdsock);
+ rp = &VNET(nfsrv_nfsuserdsock);
rp->nr_client = NULL;
NFSUNLOCKNAMEID();
rp->nr_sotype = SOCK_DGRAM;
@@ -4202,12 +4202,12 @@ nfsrv_nfsuserdport(struct nfsuserd_args *nargs, NFSPROC_T *p)
&rp->nr_client);
if (error == 0) {
NFSLOCKNAMEID();
- NFSD_VNET(nfsrv_nfsuserd) = RUNNING;
+ VNET(nfsrv_nfsuserd) = RUNNING;
NFSUNLOCKNAMEID();
} else {
free(rp->nr_nam, M_SONAME);
NFSLOCKNAMEID();
- NFSD_VNET(nfsrv_nfsuserd) = NOTRUNNING;
+ VNET(nfsrv_nfsuserd) = NOTRUNNING;
NFSUNLOCKNAMEID();
}
out:
@@ -4223,21 +4223,21 @@ nfsrv_nfsuserddelport(void)
{
NFSLOCKNAMEID();
- if (NFSD_VNET(nfsrv_nfsuserd) != RUNNING) {
+ if (VNET(nfsrv_nfsuserd) != RUNNING) {
NFSUNLOCKNAMEID();
return;
}
- NFSD_VNET(nfsrv_nfsuserd) = STARTSTOP;
+ VNET(nfsrv_nfsuserd) = STARTSTOP;
/* Wait for all upcalls to complete. */
- while (NFSD_VNET(nfsrv_userdupcalls) > 0)
- msleep(&NFSD_VNET(nfsrv_userdupcalls), NFSNAMEIDMUTEXPTR, PVFS,
+ while (VNET(nfsrv_userdupcalls) > 0)
+ msleep(&VNET(nfsrv_userdupcalls), NFSNAMEIDMUTEXPTR, PVFS,
"nfsupcalls", 0);
NFSUNLOCKNAMEID();
- newnfs_disconnect(NULL, &NFSD_VNET(nfsrv_nfsuserdsock));
- free(NFSD_VNET(nfsrv_nfsuserdsock).nr_nam, M_SONAME);
+ newnfs_disconnect(NULL, &VNET(nfsrv_nfsuserdsock));
+ free(VNET(nfsrv_nfsuserdsock).nr_nam, M_SONAME);
crfree(VNET(nfsrv_nfsuserdsock).nr_cred);
NFSLOCKNAMEID();
- NFSD_VNET(nfsrv_nfsuserd) = NOTRUNNING;
+ VNET(nfsrv_nfsuserd) = NOTRUNNING;
NFSUNLOCKNAMEID();
}
@@ -4257,7 +4257,7 @@ nfsrv_getuser(int procnum, uid_t uid, gid_t gid, char *name)
int error;
NFSLOCKNAMEID();
- if (NFSD_VNET(nfsrv_nfsuserd) != RUNNING) {
+ if (VNET(nfsrv_nfsuserd) != RUNNING) {
NFSUNLOCKNAMEID();
error = EPERM;
goto out;
@@ -4266,9 +4266,9 @@ nfsrv_getuser(int procnum, uid_t uid, gid_t gid, char *name)
* Maintain a count of upcalls in progress, so that nfsrv_X()
* can wait until no upcalls are in progress.
*/
- NFSD_VNET(nfsrv_userdupcalls)++;
+ VNET(nfsrv_userdupcalls)++;
NFSUNLOCKNAMEID();
- KASSERT(NFSD_VNET(nfsrv_userdupcalls) > 0,
+ KASSERT(VNET(nfsrv_userdupcalls) > 0,
("nfsrv_getuser: non-positive upcalls"));
nd = &nfsd;
cred = newnfs_getcred();
@@ -4286,13 +4286,13 @@ nfsrv_getuser(int procnum, uid_t uid, gid_t gid, char *name)
len = strlen(name);
(void) nfsm_strtom(nd, name, len);
}
- error = newnfs_request(nd, NULL, NULL, &NFSD_VNET(nfsrv_nfsuserdsock),
+ error = newnfs_request(nd, NULL, NULL, &VNET(nfsrv_nfsuserdsock),
NULL, NULL, cred, RPCPROG_NFSUSERD, RPCNFSUSERD_VERS, NULL, 0,
NULL, NULL);
NFSLOCKNAMEID();
- if (--NFSD_VNET(nfsrv_userdupcalls) == 0 &&
- NFSD_VNET(nfsrv_nfsuserd) == STARTSTOP)
- wakeup(&NFSD_VNET(nfsrv_userdupcalls));
+ if (--VNET(nfsrv_userdupcalls) == 0 &&
*** 2402 LINES SKIPPED ***