Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a race case of nfsrv_getcache.

Browse Source
This commit is contained in:
yamt 2003-11-20 16:17:25 +00:00
parent 91f5ee90a4
commit 0b47e1b287
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/nfs/nfs_srvcache.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_srvcache.c,v 1.28 2003/08/07 16:33:52 agc Exp $ */ /* $NetBSD: nfs_srvcache.c,v 1.29 2003/11/20 16:17:25 yamt Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -41,7 +41,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_srvcache.c,v 1.28 2003/08/07 16:33:52 agc Exp $"); __KERNEL_RCSID(0, "$NetBSD: nfs_srvcache.c,v 1.29 2003/11/20 16:17:25 yamt Exp $");
#include "opt_iso.h" #include "opt_iso.h"
@ -223,7 +223,7 @@ nfsrv_getcache(nd, slp, repp)
struct nfssvc_sock *slp; struct nfssvc_sock *slp;
struct mbuf **repp; struct mbuf **repp;
{ {
struct nfsrvcache *rp; struct nfsrvcache *rp, *rpdup;
struct mbuf *mb; struct mbuf *mb;
struct sockaddr_in *saddr; struct sockaddr_in *saddr;
caddr_t bpos; caddr_t bpos;
@ -313,12 +313,14 @@ found:
}; };
rp->rc_proc = nd->nd_procnum; rp->rc_proc = nd->nd_procnum;
simple_lock(&nfsrv_reqcache_lock); simple_lock(&nfsrv_reqcache_lock);
if (nfsrv_lookupcache(nd)) { rpdup = nfsrv_lookupcache(nd);
if (rpdup != NULL) {
/* /*
* other thread made duplicate cache entry. * other thread made duplicate cache entry.
*/ */
simple_unlock(&nfsrv_reqcache_lock); simple_unlock(&nfsrv_reqcache_lock);
pool_put(&nfs_reqcache_pool, rp); pool_put(&nfs_reqcache_pool, rp);
rp = rpdup;
goto found; goto found;
} }
TAILQ_INSERT_TAIL(&nfsrvlruhead, rp, rc_lru); TAILQ_INSERT_TAIL(&nfsrvlruhead, rp, rc_lru);