mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-14 10:09:48 +00:00
Code Issues Releases Activity

Unlock current directory when calling VFS_ROOT() because underlying

Browse Source 
filesystem may hold the lock. Otherwise unavoidable deadlock will occur.
This shouldn't have any side effects as long as we hold vfs lock.

Obtained from:	NetBSD
This commit is contained in:
Boris Popov 2000-09-13 08:57:56 +00:00
parent 01de01168f
commit 6413416817
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=65805
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/kern/vfs_lookup.c
View File

@ -274,6 +274,7 @@ lookup(ndp)
int rdonly; /* lookup read-only flag bit */
int trailing_slash;
int error = 0;
int dpunlocked = 0; /* dp has already been unlocked */
struct componentname *cnp = &ndp->ni_cnd;
struct proc *p = cnp->cn_proc;
@ -487,11 +488,14 @@ lookup(ndp)
(cnp->cn_flags & NOCROSSMOUNT) == 0) {
if (vfs_busy(mp, 0, 0, p))
continue;
VOP_UNLOCK(dp, 0, p);
error = VFS_ROOT(mp, &tdp);
vfs_unbusy(mp, p);
if (error)
if (error) {
dpunlocked = 1;
goto bad2;
vput(dp);
}
vrele(dp);
ndp->ni_vp = dp = tdp;
}
@ -557,7 +561,10 @@ lookup(ndp)
VOP_UNLOCK(ndp->ni_dvp, 0, p);
vrele(ndp->ni_dvp);
bad:
vput(dp);
if (dpunlocked)
vrele(dp);
else
vput(dp);
ndp->ni_vp = NULL;
return (error);
}