diff options
| author | jeff <jeff@FreeBSD.org> | 2002-09-25 01:44:21 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2002-09-25 01:44:21 +0000 |
| commit | fb084122919545668cee67d75d9e42e4df2e091e (patch) | |
| tree | 1008bb6d4c8044aeb88c5483cc6de9bb48217786 /sys/kern | |
| parent | 0649189fd776d36c74129a97fa91f70bd08dde64 (diff) | |
| download | FreeBSD-src-fb084122919545668cee67d75d9e42e4df2e091e.zip FreeBSD-src-fb084122919545668cee67d75d9e42e4df2e091e.tar.gz | |
- Don't protect mountedhere with the vn interlock.
- Protect mountedhere with the vn lock.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/vfs_mount.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 64e18ae..f7bb072 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -740,8 +740,8 @@ update: VI_LOCK(vp); vp->v_iflag &= ~VI_MOUNT; - vp->v_mountedhere = mp; VI_UNLOCK(vp); + vp->v_mountedhere = mp; mtx_lock(&mountlist_mtx); TAILQ_INSERT_TAIL(&mountlist, mp, mnt_list); mtx_unlock(&mountlist_mtx); @@ -1093,11 +1093,10 @@ update: if (!error) { struct vnode *newdp; - mp_fixme("Does interlock protect mounted here or not?"); VI_LOCK(vp); vp->v_iflag &= ~VI_MOUNT; - vp->v_mountedhere = mp; VI_UNLOCK(vp); + vp->v_mountedhere = mp; mtx_lock(&mountlist_mtx); TAILQ_INSERT_TAIL(&mountlist, mp, mnt_list); mtx_unlock(&mountlist_mtx); @@ -1139,7 +1138,7 @@ checkdirs(olddp, newdp) struct proc *p; int nrele; - if (olddp->v_usecount == 1) + if (vrefcnt(olddp) == 1) return; sx_slock(&allproc_lock); LIST_FOREACH(p, &allproc, p_list) { @@ -1321,8 +1320,11 @@ dounmount(mp, flags, td) crfree(mp->mnt_cred); mtx_lock(&mountlist_mtx); TAILQ_REMOVE(&mountlist, mp, mnt_list); - if ((coveredvp = mp->mnt_vnodecovered) != NULL) + if ((coveredvp = mp->mnt_vnodecovered) != NULL) { + vn_lock(coveredvp, LK_EXCLUSIVE|LK_RETRY, td); coveredvp->v_mountedhere = NULL; + VOP_UNLOCK(coveredvp, 0, td); + } mp->mnt_vfc->vfc_refcount--; if (!TAILQ_EMPTY(&mp->mnt_nvnodelist)) panic("unmount: dangling vnode"); |
