From b30fcf9a566732e20b27337a567d866f82843f87 Mon Sep 17 00:00:00 2001
From: jdolecek <jdolecek@NetBSD.org>
Date: Sun, 17 Oct 1999 10:18:15 +0000
Subject: [PATCH] lock the device vnode before calling VOP_CLOSE() only under
 NetBSD some minor cleanup in ntfs_unmount()

---
 sys/ntfs/ntfs_vfsops.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index 24967b6ba32e..76f8a531aab1 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ntfs_vfsops.c,v 1.17 1999/10/16 23:53:28 wrstuden Exp $	*/
+/*	$NetBSD: ntfs_vfsops.c,v 1.18 1999/10/17 10:18:15 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 Semen Ustimenko
@@ -606,9 +606,16 @@ out:
 #endif
 	if (bp)
 		brelse(bp);
+
+#if defined __NetBSD__
+	/* lock the device vnode before calling VOP_CLOSE() */
 	vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
 	(void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED, p);
 	VOP_UNLOCK(devvp, 0);
+#else
+	(void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED, p);
+#endif
+	
 	return (error);
 }
 
@@ -660,21 +667,26 @@ ntfs_unmount(
 
 #if defined(__FreeBSD__)
 	ntmp->ntm_devvp->v_specmountpoint = NULL;
+
+	VOP_LOCK(ntmp->ntm_devvp);
+	vnode_pager_uncache(ntmp->ntm_devvp);
+	VOP_UNLOCK(ntmp->ntm_devvp);
 #else
 	ntmp->ntm_devvp->v_specflags &= ~SI_MOUNTEDON;
 #endif
 
-#ifndef __NetBSD__
-	VOP_LOCK(ntmp->ntm_devvp);
-	vnode_pager_uncache(ntmp->ntm_devvp);
-	VOP_UNLOCK(ntmp->ntm_devvp);
-#endif
-
 	vinvalbuf(ntmp->ntm_devvp, V_SAVE, NOCRED, p, 0, 0);
+
+#if defined(__NetBSD__)
+	/* lock the device vnode before calling VOP_CLOSE() */
 	VOP_LOCK(ntmp->ntm_devvp, LK_EXCLUSIVE | LK_RETRY);
 	error = VOP_CLOSE(ntmp->ntm_devvp, ronly ? FREAD : FREAD|FWRITE,
 		NOCRED, p);
 	VOP_UNLOCK(ntmp->ntm_devvp, 0);
+#else
+	error = VOP_CLOSE(ntmp->ntm_devvp, ronly ? FREAD : FREAD|FWRITE,
+		NOCRED, p);
+#endif
 
 	vrele(ntmp->ntm_devvp);