summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1997-02-18 04:58:11 +0000
committerbde <bde@FreeBSD.org>1997-02-18 04:58:11 +0000
commit8f26a5330a89c272f514bfb8c4320300ea592ddb (patch)
tree3ae8c246948783a3d433682842ba7776fcc1ae91 /sys/kern
parent74d2ce4e0bc1397b11a40fffe292588106597366 (diff)
downloadFreeBSD-src-8f26a5330a89c272f514bfb8c4320300ea592ddb.zip
FreeBSD-src-8f26a5330a89c272f514bfb8c4320300ea592ddb.tar.gz
Changed `#ifdef COMPAT_PRELITE2' to `#ifndef NO_COMPAT_PRELITE2' so that
the old VFS_VFSCONF sysctl is enabled by default. Initialize the vfc_vfsops field to non-NULL in sysctl_ovfs_conf() so that the old VFS_VFSCONF sysctl actually works. The old (still current) getvfsent.c uses this "kernel-only" field to decide which vfs's are configured (the old implementation returned null entries for unconfigured vfs's).
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/vfs_init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 161ff0c..790fb51 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -296,7 +296,7 @@ sysctl_vfs_conf SYSCTL_HANDLER_ARGS
SYSCTL_PROC(_vfs, VFS_VFSCONF, vfsconf, CTLTYPE_OPAQUE|CTLFLAG_RD,
0, 0, sysctl_vfs_conf, "S,vfsconf", "");
-#ifdef COMPAT_PRELITE2
+#ifndef NO_COMPAT_PRELITE2
#define OVFS_MAXNAMELEN 32
struct ovfsconf {
@@ -317,7 +317,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
return EINVAL;
for (vfsp = vfsconf; vfsp; vfsp = vfsp->vfc_next) {
struct ovfsconf ovfs;
- ovfs.vfc_vfsops = NULL;
+ ovfs.vfc_vfsops = vfsp->vfc_vfsops; /* XXX used as flag */
strcpy(ovfs.vfc_name, vfsp->vfc_name);
ovfs.vfc_index = vfsp->vfc_typenum;
ovfs.vfc_refcount = vfsp->vfc_refcount;
@@ -332,7 +332,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
SYSCTL_PROC(_vfs, VFS_OVFSCONF, ovfsconf, CTLTYPE_OPAQUE|CTLFLAG_RD,
0, 0, sysctl_ovfs_conf, "S,ovfsconf", "");
-#endif /* COMPAT_PRELITE2 */
+#endif /* !NO_COMPAT_PRELITE2 */
/*
* This goop is here to support a loadable NFS module... grumble...
OpenPOWER on IntegriCloud