From 39df86086fbadd0ab8955fc13331ed4f940a244d Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Fri, 6 Oct 2000 08:04:48 +0000 Subject: [PATCH] Do not call lockdestroy() for v_vnlock, which may point to a lock in a deeper vfs stacking layer. Submitted by: bp --- sys/kern/vfs_export.c | 5 +---- sys/kern/vfs_subr.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 07aef59c9af..c37397a3ad6 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -1794,10 +1794,7 @@ vclean(vp, flags, p) } cache_purge(vp); - if (vp->v_vnlock) { - lockdestroy(vp->v_vnlock); - vp->v_vnlock = NULL; - } + vp->v_vnlock = NULL; lockdestroy(&vp->v_lock); if (VSHOULDFREE(vp)) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 07aef59c9af..c37397a3ad6 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1794,10 +1794,7 @@ vclean(vp, flags, p) } cache_purge(vp); - if (vp->v_vnlock) { - lockdestroy(vp->v_vnlock); - vp->v_vnlock = NULL; - } + vp->v_vnlock = NULL; lockdestroy(&vp->v_lock); if (VSHOULDFREE(vp))