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

On forced unmount, do a few passes of non-forced cleanups and then do

Browse Source 
a single forced pass.  Along for the ride with PR5146 fix.
This commit is contained in:
sommerfeld 1999-07-31 23:56:15 +00:00
parent d6fd753892
commit 29469abdbd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/miscfs/union/union_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: union_vfsops.c,v 1.22 1999/05/02 00:18:31 thorpej Exp $ */
/* $NetBSD: union_vfsops.c,v 1.23 1999/07/31 23:56:15 sommerfeld Exp $ */
/*
* Copyright (c) 1994 The Regents of the University of California.
@ -294,15 +294,11 @@ union_unmount(mp, mntflags, p)
struct vnode *um_rootvp;
int error;
int freeing;
int flags = 0;
#ifdef UNION_DIAGNOSTIC
printf("union_unmount(mp = %p)\n", mp);
#endif
if (mntflags & MNT_FORCE)
flags |= FORCECLOSE;
if ((error = union_root(mp, &um_rootvp)) != 0)
return (error);
@ -315,7 +311,7 @@ union_unmount(mp, mntflags, p)
* (d) times, where (d) is the maximum tree depth
* in the filesystem.
*/
for (freeing = 0; vflush(mp, um_rootvp, flags) != 0;) {
for (freeing = 0; vflush(mp, um_rootvp, 0) != 0;) {
struct vnode *vp;
int n;
@ -333,6 +329,14 @@ union_unmount(mp, mntflags, p)
freeing = n;
}
/*
* Ok, now that we've tried doing it gently, get out the hammer.
*/
if (mntflags & MNT_FORCE)
vflush(mp, um_rootvp, FORCECLOSE);
/* At this point the root vnode should have a single reference */
if (um_rootvp->v_usecount > 1) {
vput(um_rootvp);