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

Repair vnode locking in portal_lookup(). Specifically, lock the file

Browse Source 
vnode, and unlock the parent directory vnode if LOCKPARENT is not set.

Obtained from:	NetBSD (rev. 1.34)
This commit is contained in:
Tim J. Robbins 2003-01-05 00:46:01 +00:00
parent c41a3921ef
commit a3ebcd98e1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/fs/portalfs/portal_vnops.c
View File

@ -108,6 +108,7 @@ portal_lookup(ap)
struct vnode **vpp = ap->a_vpp;
struct vnode *dvp = ap->a_dvp;
char *pname = cnp->cn_nameptr;
struct thread *td = cnp->cn_thread;
struct portalnode *pt;
int error;
struct vnode *fvp = 0;
@ -122,7 +123,6 @@ portal_lookup(ap)
if (cnp->cn_namelen == 1 && *pname == '.') {
*vpp = dvp;
VREF(dvp);
/*VOP_LOCK(dvp);*/
return (0);
}
@ -156,7 +156,15 @@ portal_lookup(ap)
pt->pt_fileid = portal_fileid++;
*vpp = fvp;
/*VOP_LOCK(fvp);*/
vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY, td);
/*
* As we are the last component of the path name, fix up
* the locking on the directory node.
*/
if ((cnp->cn_flags & LOCKPARENT) == 0) {
VOP_UNLOCK(dvp, 0, td);
cnp->cn_flags |= PDIRUNLOCK;
}
return (0);
bad:;