Converted the silly SAFTEY option into a new-style option by renaming it to

DIAGNOSTIC.

Fixed an English style bug in the panic messages controlled by SAFETY.

7 files changed, 8 insertions, 28 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 5f5eba98f872..544b2f402858 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -602,12 +602,6 @@ options 	CD9660_ROOTDELAY=20
 #
 options 	SUIDDIR
 
-
-# Add some error checking code to the null_bypass routine
-# in the NULL filesystem
-#options 	SAFETY
-
-
 # NFS options:
 options 	NFS_MINATTRTIMO=3	# VREG attrib cache timeout in sec
 options 	NFS_MAXATTRTIMO=60
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index c9019210da55..6156d0f3c734 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -206,7 +206,6 @@ static int	null_unlock __P((struct vop_unlock_args *ap));
  *    This version has been optimized for speed, throwing away some
  * safety checks.  It should still always work, but it's not as
  * robust to programmer errors.
- *    Define SAFETY to include some error checking code.
  *
  * In general, we map all vnodes going down and unmap them on the way back.
  * As an exception to this, vnodes can be marked "unmapped" by setting
@@ -244,13 +243,13 @@ null_bypass(ap)
 	if (null_bug_bypass)
 		printf ("null_bypass: %s\n", descp->vdesc_name);
 
-#ifdef SAFETY
+#ifdef DIAGNOSTIC
 	/*
 	 * We require at least one vp.
 	 */
 	if (descp->vdesc_vp_offsets == NULL ||
 	    descp->vdesc_vp_offsets[0] == VDESC_NO_OFFSET)
-		panic ("null_bypass: no vp's in map.");
+		panic ("null_bypass: no vp's in map");
 #endif
 
 	/*
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index 0b73ccbb39dc..02135b2409f1 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -93,13 +93,13 @@ umap_bypass(ap)
 	if (umap_bug_bypass)
 		printf ("umap_bypass: %s\n", descp->vdesc_name);
 
-#ifdef SAFETY
+#ifdef DIAGNOSTIC
 	/*
 	 * We require at least one vp.
 	 */
 	if (descp->vdesc_vp_offsets == NULL ||
 	    descp->vdesc_vp_offsets[0] == VDESC_NO_OFFSET)
-		panic ("umap_bypass: no vp's in map.");
+		panic ("umap_bypass: no vp's in map");
 #endif
 
 	/*
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 5f5eba98f872..544b2f402858 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -602,12 +602,6 @@ options 	CD9660_ROOTDELAY=20
 #
 options 	SUIDDIR
 
-
-# Add some error checking code to the null_bypass routine
-# in the NULL filesystem
-#options 	SAFETY
-
-
 # NFS options:
 options 	NFS_MINATTRTIMO=3	# VREG attrib cache timeout in sec
 options 	NFS_MAXATTRTIMO=60
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 5f5eba98f872..544b2f402858 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -602,12 +602,6 @@ options 	CD9660_ROOTDELAY=20
 #
 options 	SUIDDIR
 
-
-# Add some error checking code to the null_bypass routine
-# in the NULL filesystem
-#options 	SAFETY
-
-
 # NFS options:
 options 	NFS_MINATTRTIMO=3	# VREG attrib cache timeout in sec
 options 	NFS_MAXATTRTIMO=60
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index c9019210da55..6156d0f3c734 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -206,7 +206,6 @@ static int	null_unlock __P((struct vop_unlock_args *ap));
  *    This version has been optimized for speed, throwing away some
  * safety checks.  It should still always work, but it's not as
  * robust to programmer errors.
- *    Define SAFETY to include some error checking code.
  *
  * In general, we map all vnodes going down and unmap them on the way back.
  * As an exception to this, vnodes can be marked "unmapped" by setting
@@ -244,13 +243,13 @@ null_bypass(ap)
 	if (null_bug_bypass)
 		printf ("null_bypass: %s\n", descp->vdesc_name);
 
-#ifdef SAFETY
+#ifdef DIAGNOSTIC
 	/*
 	 * We require at least one vp.
 	 */
 	if (descp->vdesc_vp_offsets == NULL ||
 	    descp->vdesc_vp_offsets[0] == VDESC_NO_OFFSET)
-		panic ("null_bypass: no vp's in map.");
+		panic ("null_bypass: no vp's in map");
 #endif
 
 	/*
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index 0b73ccbb39dc..02135b2409f1 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/umapfs/umap_vnops.c
@@ -93,13 +93,13 @@ umap_bypass(ap)
 	if (umap_bug_bypass)
 		printf ("umap_bypass: %s\n", descp->vdesc_name);
 
-#ifdef SAFETY
+#ifdef DIAGNOSTIC
 	/*
 	 * We require at least one vp.
 	 */
 	if (descp->vdesc_vp_offsets == NULL ||
 	    descp->vdesc_vp_offsets[0] == VDESC_NO_OFFSET)
-		panic ("umap_bypass: no vp's in map.");
+		panic ("umap_bypass: no vp's in map");
 #endif
 
 	/*