Convert DEVFS from an "opt-in" to an "opt-out" option.

If for some reason DEVFS is undesired, the "NODEVFS" option is
needed now.

Pending any significant issues, DEVFS will be made mandatory in
-current on july 1st so that we can start reaping the full
benefits of having it.

3 files changed, 8 insertions, 5 deletions

diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c
index 4dfd0e5..224ca07 100644
--- a/sys/fs/devfs/devfs_devs.c
+++ b/sys/fs/devfs/devfs_devs.c
@@ -30,6 +30,7 @@
  */
 
 #include "opt_devfs.h"
+#ifndef NODEVFS
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -431,3 +432,4 @@ devfs_destroy(dev_t dev)
 devfs_create_t *devfs_create_hook = devfs_create;
 devfs_destroy_t *devfs_destroy_hook = devfs_destroy;
 int devfs_present = 1;
+#endif
diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c
index 69ec9b2..6ab9cf1 100644
--- a/sys/fs/devfs/devfs_vfsops.c
+++ b/sys/fs/devfs/devfs_vfsops.c
@@ -35,6 +35,7 @@
  */
 
 #include "opt_devfs.h"
+#ifndef NODEVFS
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -207,3 +208,4 @@ static struct vfsops devfs_vfsops = {
 };
 
 VFS_SET(devfs_vfsops, devfs, VFCF_SYNTHETIC);
+#endif
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index 80dfad8..fc0e392 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -1,4 +1,3 @@
-#define DEBUG 1
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -35,6 +34,9 @@
  * $FreeBSD$
  */
 
+#include <opt_devfs.h>
+#ifndef NODEVFS
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -193,10 +195,6 @@ devfs_getattr(ap)
 	vap->va_nlink = de->de_links;
 	vap->va_fileid = de->de_inode;
 
-#ifdef DEBUG
-	if (error)
-		printf("devfs_getattr: return error %d\n", error);
-#endif
 	return (error);
 }
 
@@ -711,3 +709,4 @@ static struct vnodeopv_desc devfs_specop_opv_desc =
 	{ &devfs_specop_p, devfs_specop_entries };
 
 VNODEOP_SET(devfs_specop_opv_desc);
+#endif