diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2012-03-02 09:48:46 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2012-03-02 09:48:46 +0000 |
| commit | 66f02f4b25717ba2cdb2ed730c1ab21a6eff33d0 (patch) | |
| tree | 47a26492ca3c5502f8ab13c61ba577a6dce15490 /sys/fs/nullfs | |
| parent | 1e0f75d313f333e58807ea468b50c44a4a2578e5 (diff) | |
| download | src-66f02f4b25717ba2cdb2ed730c1ab21a6eff33d0.tar.gz src-66f02f4b25717ba2cdb2ed730c1ab21a6eff33d0.zip | |
Do not expose unlocked unconstructed nullfs vnode on mount list.
Lock the native nullfs vnode lock before switching the locks.
Tested by: pho
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=232383
Diffstat (limited to 'sys/fs/nullfs')
| -rw-r--r-- | sys/fs/nullfs/null_subr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index ae29bfccba7a..7e3571dcb47d 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -172,12 +172,12 @@ static void null_destroy_proto(struct vnode *vp, void *xp) { + lockmgr(&vp->v_lock, LK_EXCLUSIVE, NULL); VI_LOCK(vp); vp->v_data = NULL; vp->v_vnlock = &vp->v_lock; vp->v_op = &dead_vnodeops; VI_UNLOCK(vp); - (void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); vgone(vp); vput(vp); free(xp, M_NULLFSNODE); |