summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpf <mpf@openbsd.org>2007-11-24 12:57:18 +0000
committermpf <mpf@openbsd.org>2007-11-24 12:57:18 +0000
commit5cc73498f0dd003effaaec536854a0b186bbe6fb (patch)
treefc2d099f41966fdec608200a495c86b0c91f315a
parentenable PCIAGP on amd64, tested for some time now by various people (diff)
downloadwireguard-openbsd-5cc73498f0dd003effaaec536854a0b186bbe6fb.tar.xz
wireguard-openbsd-5cc73498f0dd003effaaec536854a0b186bbe6fb.zip
Try a forced unmount if mount_mfs is killed with SIGKILL.
OK tedu@
-rw-r--r--sys/ufs/mfs/mfs_vfsops.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index eec5af19639..adaf82c5f60 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfs_vfsops.c,v 1.34 2006/06/25 15:01:54 sturm Exp $ */
+/* $OpenBSD: mfs_vfsops.c,v 1.35 2007/11/24 12:57:18 mpf Exp $ */
/* $NetBSD: mfs_vfsops.c,v 1.10 1996/02/09 22:31:28 christos Exp $ */
/*
@@ -264,7 +264,8 @@ mfs_start(struct mount *mp, int flags, struct proc *p)
*/
if (sleepreturn != 0) {
if (vfs_busy(mp, VB_WRITE|VB_NOWAIT) ||
- dounmount(mp, 0, p, NULL))
+ dounmount(mp,
+ (CURSIG(p) == SIGKILL) ? MNT_FORCE : 0, p, NULL))
CLRSIG(p, CURSIG(p));
sleepreturn = 0;
continue;