summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/dev/vn/vn.c4
-rw-r--r--usr.sbin/vnconfig/vnconfig.c1
2 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index efbc437..a788b8a 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -82,9 +82,7 @@
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
-#include <vm/vm_pageout.h>
#include <vm/swap_pager.h>
-#include <vm/vm_extern.h>
static d_ioctl_t vnioctl;
static d_open_t vnopen;
@@ -146,7 +144,7 @@ static SLIST_HEAD(, vn_softc) vn_list;
#define VNF_INITED 0x01
#define VNF_READONLY 0x02
-static u_long vn_options;
+static u_long vn_options = VN_LABELS;
#define IFOPT(vn,opt) if (((vn)->sc_options|vn_options) & (opt))
#define TESTOPT(vn,opt) (((vn)->sc_options|vn_options) & (opt))
diff --git a/usr.sbin/vnconfig/vnconfig.c b/usr.sbin/vnconfig/vnconfig.c
index ad7e39e..c80d0db 100644
--- a/usr.sbin/vnconfig/vnconfig.c
+++ b/usr.sbin/vnconfig/vnconfig.c
@@ -238,7 +238,6 @@ what_opt(str,p)
if (!strcmp(str,"labels")) { *p |= VN_LABELS; return 0; }
if (!strcmp(str,"follow")) { *p |= VN_FOLLOW; return 0; }
if (!strcmp(str,"debug")) { *p |= VN_DEBUG; return 0; }
- if (!strcmp(str,"io")) { *p |= VN_IO; return 0; }
if (!strcmp(str,"all")) { *p |= ~0; return 0; }
if (!strcmp(str,"none")) { *p |= 0; return 0; }
return 1;
OpenPOWER on IntegriCloud