Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lock the device vnode before calling VOP_CLOSE() only under NetBSD 

some minor cleanup in ntfs_unmount()
This commit is contained in:
jdolecek 1999-10-17 10:18:15 +00:00
parent 2674b15280
commit b30fcf9a56
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/ntfs/ntfs_vfsops.c
View File

@ -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);