Oops, the previous revision unconfigured too much pre-Lite2 compatibilty

cruft.  At least lsvfs(1) was broken.
This commit is contained in:
Bruce Evans 1998-08-29 13:13:10 +00:00
parent e3706b10d9
commit f5ce675296
2 changed files with 8 additions and 8 deletions

View file

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
* $Id: vfs_subr.c,v 1.159 1998/07/12 16:45:39 dfr Exp $
* $Id: vfs_subr.c,v 1.160 1998/08/12 20:17:42 bde Exp $
*/
/*
@ -1992,7 +1992,7 @@ vfs_sysctl SYSCTL_HANDLER_ARGS
u_int namelen = arg2 + 1; /* XXX */
struct vfsconf *vfsp;
#ifdef COMPAT_PRELITE2
#if 1 || defined(COMPAT_PRELITE2)
/* Resolve ambiguity between VFS_VFSCONF and VFS_GENERIC. */
if (namelen == 1)
return (sysctl_ovfs_conf(oidp, arg1, arg2, req));
@ -2033,7 +2033,7 @@ vfs_sysctl SYSCTL_HANDLER_ARGS
SYSCTL_NODE(_vfs, VFS_GENERIC, generic, CTLFLAG_RD, vfs_sysctl,
"Generic filesystem");
#ifdef COMPAT_PRELITE2
#if 1 || defined(COMPAT_PRELITE2)
static int
sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
@ -2055,7 +2055,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
return 0;
}
#endif /* COMPAT_PRELITE2 */
#endif /* 1 || COMPAT_PRELITE2 */
static volatile int kinfo_vdebug = 1;

View file

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
* $Id: vfs_subr.c,v 1.159 1998/07/12 16:45:39 dfr Exp $
* $Id: vfs_subr.c,v 1.160 1998/08/12 20:17:42 bde Exp $
*/
/*
@ -1992,7 +1992,7 @@ vfs_sysctl SYSCTL_HANDLER_ARGS
u_int namelen = arg2 + 1; /* XXX */
struct vfsconf *vfsp;
#ifdef COMPAT_PRELITE2
#if 1 || defined(COMPAT_PRELITE2)
/* Resolve ambiguity between VFS_VFSCONF and VFS_GENERIC. */
if (namelen == 1)
return (sysctl_ovfs_conf(oidp, arg1, arg2, req));
@ -2033,7 +2033,7 @@ vfs_sysctl SYSCTL_HANDLER_ARGS
SYSCTL_NODE(_vfs, VFS_GENERIC, generic, CTLFLAG_RD, vfs_sysctl,
"Generic filesystem");
#ifdef COMPAT_PRELITE2
#if 1 || defined(COMPAT_PRELITE2)
static int
sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
@ -2055,7 +2055,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
return 0;
}
#endif /* COMPAT_PRELITE2 */
#endif /* 1 || COMPAT_PRELITE2 */
static volatile int kinfo_vdebug = 1;