diff options
| author |   natano <natano@openbsd.org> | 2016-05-26 16:03:29 +0000 |
|---|---|---|
| committer | natano <natano@openbsd.org> | 2016-05-26 16:03:29 +0000 |
| commit | 065726a5963b22e3a4ec8465c1723ed4a3bc81f8 (patch) | |
| tree | 8f3901fd00dfb52aea8a785f97cd25b290730f22 | |
| parent | Use S_ISDIR instead of doing it by hand. No binary change. (diff) | |
| download | wireguard-openbsd-065726a5963b22e3a4ec8465c1723ed4a3bc81f8.tar.xz wireguard-openbsd-065726a5963b22e3a4ec8465c1723ed4a3bc81f8.zip | |
The doforce variable isn't modified anywhere. Also, the only filesystem
left using it is fuse. It has been removed from all other filesystems.
ok millert deraadt
| -rw-r--r-- | sys/kern/vfs_subr.c | 3 | ||||
| -rw-r--r-- | sys/miscfs/fuse/fuse_vfsops.c | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 71b4b7b1982..f81751ca651 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_subr.c,v 1.246 2016/04/26 18:23:07 natano Exp $ */ +/* $OpenBSD: vfs_subr.c,v 1.247 2016/05/26 16:03:29 natano Exp $ */ /* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* @@ -84,7 +84,6 @@ int vttoif_tab[9] = { S_IFSOCK, S_IFIFO, S_IFMT, }; -int doforce = 1; /* 1 => permit forcible unmounting */ int prtactive = 0; /* 1 => print out reclaim of active vnodes */ int suid_clear = 1; /* 1 => clear SUID / SGID on owner change */ diff --git a/sys/miscfs/fuse/fuse_vfsops.c b/sys/miscfs/fuse/fuse_vfsops.c index 36584775d63..dd3b4c9355c 100644 --- a/sys/miscfs/fuse/fuse_vfsops.c +++ b/sys/miscfs/fuse/fuse_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_vfsops.c,v 1.21 2016/04/26 18:37:02 natano Exp $ */ +/* $OpenBSD: fuse_vfsops.c,v 1.22 2016/05/26 16:03:29 natano Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -135,19 +135,13 @@ fusefs_unmount(struct mount *mp, int mntflags, struct proc *p) { struct fusefs_mnt *fmp; struct fusebuf *fbuf; - extern int doforce; int flags = 0; int error; fmp = VFSTOFUSEFS(mp); - if (mntflags & MNT_FORCE) { - /* fusefs can never be rootfs so don't check for it */ - if (!doforce) - return (EINVAL); - + if (mntflags & MNT_FORCE) flags |= FORCECLOSE; - } if ((error = vflush(mp, NULLVP, flags))) return (error); |