d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the fix in the rev. 1.179 to use nfsrv_lockedpair_nd().

Browse Source 
Tested by:	pho
MFC after:	3 days
This commit is contained in:
Konstantin Belousov 2008-05-28 16:23:17 +00:00
parent 0ebda62134
commit 7763d855c4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=179381
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/nfsserver/nfs_serv.c
View File

@ -2148,7 +2148,7 @@ nfsrv_remove(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
nfsfh_t nfh;
fhandle_t *fhp;
struct mount *mp = NULL;
int vfslocked, vfslocked1;
int vfslocked;
nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
ndclear(&nd);
@ -2170,11 +2170,7 @@ nfsrv_remove(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
nd.ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF | MPSAFE;
error = nfs_namei(&nd, fhp, len, slp, nam, &md, &dpos,
&dirp, v3, &dirfor, &dirfor_ret, td, FALSE);
vfslocked1 = NDHASGIANT(&nd);
if (vfslocked && vfslocked1)
VFS_UNLOCK_GIANT(vfslocked1);
if (vfslocked || vfslocked1)
vfslocked = 1;
vfslocked = nfsrv_lockedpair_nd(vfslocked, &nd);
if (dirp && !v3) {
vrele(dirp);
dirp = NULL;