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.
This commit is contained in:
parent
1ff1015930
commit
4047cd0bb2
@ -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
|
||||
|
@ -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
|
||||
|
||||
/*
|
||||
|
@ -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
|
||||
|
||||
/*
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
/*
|
||||
|
@ -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
|
||||
|
||||
/*
|
||||
|
Loading…
x
Reference in New Issue
Block a user