summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2003-05-11 03:30:26 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2003-05-11 03:30:26 +0000
commit1709925a610ae27ace4f90e98631983867b26ea6 (patch)
treebefc7df95f6b67e9c62c35a154efc7108633ba55 /sys
parente2961591bcecfb46e2932aea151b57208727542f (diff)
revert part of previous. if mfs gets a signal, it doesn't attempt to
force the unmount, so there's no need to mess with resetting processes' working dirs.
Diffstat (limited to 'sys')
-rw-r--r--sys/ufs/mfs/mfs_vfsops.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index f02d061e52d..046559eda40 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.23 2003/05/06 20:52:14 tedu Exp $ */
+/* $OpenBSD: mfs_vfsops.c,v 1.24 2003/05/11 03:30:25 tedu Exp $ */
/* $NetBSD: mfs_vfsops.c,v 1.10 1996/02/09 22:31:28 christos Exp $ */
/*
@@ -259,7 +259,6 @@ mfs_start(mp, flags, p)
struct proc *p;
{
struct vnode *vp = VFSTOUFS(mp)->um_devvp;
- struct vnode *rvp;
struct mfsnode *mfsp = VTOMFS(vp);
struct buf *bp;
caddr_t base;
@@ -279,12 +278,8 @@ mfs_start(mp, flags, p)
* EINTR/ERESTART.
*/
if (sleepreturn != 0) {
- if (ufs_root(mp, &rvp))
- rvp = NULL;
- else
- vput(rvp);
if (vfs_busy(mp, LK_EXCLUSIVE|LK_NOWAIT, NULL, p) ||
- dounmount(mp, 0, p, rvp))
+ dounmount(mp, 0, p, NULL))
CLRSIG(p, CURSIG(p));
sleepreturn = 0;
continue;