diff options
author | bde <bde@FreeBSD.org> | 1998-08-29 13:13:10 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1998-08-29 13:13:10 +0000 |
commit | d3f8ad18751f180c706a043a1eae19bb9a74c1d0 (patch) | |
tree | 51eb6bb9f778a7f8fef9fa6efbb87899e1bc4057 /sys | |
parent | f9c986074aac4d56a4e8b972a8c90f7824362409 (diff) | |
download | FreeBSD-src-d3f8ad18751f180c706a043a1eae19bb9a74c1d0.zip FreeBSD-src-d3f8ad18751f180c706a043a1eae19bb9a74c1d0.tar.gz |
Oops, the previous revision unconfigured too much pre-Lite2 compatibilty
cruft. At least lsvfs(1) was broken.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/kern/vfs_export.c | 8 | ||||
-rw-r--r-- | sys/kern/vfs_subr.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index bd39448..1c1a427 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -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; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index bd39448..1c1a427 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -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; |