- Add a new function nfsrv_destroycache() to tear down the server request
cache when unloading the nfsserver module. This fixes a memory leak and a stale pointer. - Use callout_drain() rather than callout_stop() when unloading the nfsserver module. MFC after: 3 days
This commit is contained in:
parent
be698f1e7f
commit
6cba7f3609
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=160881
@ -337,6 +337,7 @@ int nfs_namei(struct nameidata *, fhandle_t *, int,
|
||||
void nfsm_adj(struct mbuf *, int, int);
|
||||
int nfsm_mbuftouio(struct mbuf **, struct uio *, int, caddr_t *);
|
||||
void nfsrv_initcache(void);
|
||||
void nfsrv_destroycache(void);
|
||||
void nfsrv_timer(void *);
|
||||
int nfsrv_dorec(struct nfssvc_sock *, struct nfsd *,
|
||||
struct nfsrv_descript **);
|
||||
|
@ -65,6 +65,7 @@ static long desirednfsrvcache;
|
||||
static LIST_HEAD(nfsrvhash, nfsrvcache) *nfsrvhashtbl;
|
||||
static TAILQ_HEAD(nfsrvlru, nfsrvcache) nfsrvlruhead;
|
||||
static u_long nfsrvhash;
|
||||
static eventhandler_tag nfsrv_nmbclusters_tag;
|
||||
|
||||
#define TRUE 1
|
||||
#define FALSE 0
|
||||
@ -147,8 +148,19 @@ nfsrv_initcache(void)
|
||||
nfsrvcache_size_change(NULL);
|
||||
nfsrvhashtbl = hashinit(desirednfsrvcache, M_NFSD, &nfsrvhash);
|
||||
TAILQ_INIT(&nfsrvlruhead);
|
||||
EVENTHANDLER_REGISTER(nmbclusters_change, nfsrvcache_size_change, NULL,
|
||||
EVENTHANDLER_PRI_FIRST);
|
||||
nfsrv_nmbclusters_tag = EVENTHANDLER_REGISTER(nmbclusters_change,
|
||||
nfsrvcache_size_change, NULL, EVENTHANDLER_PRI_FIRST);
|
||||
}
|
||||
|
||||
/*
|
||||
* Teardown the server request cache list
|
||||
*/
|
||||
void
|
||||
nfsrv_destroycache(void)
|
||||
{
|
||||
KASSERT(TAILQ_EMPTY(&nfsrvlruhead), ("%s: pending requests", __func__));
|
||||
EVENTHANDLER_DEREGISTER(nmbclusters_change, nfsrv_nmbclusters_tag);
|
||||
hashdestroy(nfsrvhashtbl, M_NFSD, nfsrvhash);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -567,9 +567,10 @@ nfsrv_modevent(module_t mod, int type, void *data)
|
||||
break;
|
||||
}
|
||||
|
||||
callout_stop(&nfsrv_callout);
|
||||
callout_drain(&nfsrv_callout);
|
||||
sysent[SYS_nfssvc].sy_narg = nfs_prev_nfssvc_sy_narg;
|
||||
sysent[SYS_nfssvc].sy_call = nfs_prev_nfssvc_sy_call;
|
||||
nfsrv_destroycache(); /* Free the server request cache */
|
||||
mtx_destroy(&nfsd_mtx);
|
||||
break;
|
||||
default:
|
||||
|
Loading…
Reference in New Issue
Block a user