Stop displaying vfsconf reference counts so that the vfc_refcount field

can be removed from struct mount.

As a result of this diff, arrays vfsname[] and vfsvars[] are indexed
by filesystem typenum. This makes the vfs_typenums[] array redundant.

OK bluhm@ mpi@

1 files changed, 8 insertions, 65 deletions

diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 25321169f58..d4576020e51 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysctl.c,v 1.234 2018/08/24 06:43:22 jsg Exp $	*/
+/*	$OpenBSD: sysctl.c,v 1.235 2018/09/21 14:31:29 visa Exp $	*/
 /*	$NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $	*/
 
 /*
@@ -195,8 +195,7 @@ int sysctl_bpf(char *, char **, int *, int, int *);
 int sysctl_mpls(char *, char **, int *, int, int *);
 int sysctl_pipex(char *, char **, int *, int, int *);
 int sysctl_fs(char *, char **, int *, int, int *);
-static int sysctl_vfs(char *, char **, int[], int, int *);
-static int sysctl_vfsgen(char *, char **, int[], int, int *);
+int sysctl_vfs(char *, char **, int[], int, int *);
 int sysctl_bios(char *, char **, int *, int, int *);
 int sysctl_swpenc(char *, char **, int *, int, int *);
 int sysctl_forkstat(char *, char **, int *, int, int *);
@@ -731,10 +730,7 @@ parse(char *string, int flags)
 		return;
 
 	case CTL_VFS:
-		if (mib[1])
-			len = sysctl_vfs(string, &bufp, mib, flags, &type);
-		else
-			len = sysctl_vfsgen(string, &bufp, mib, flags, &type);
+		len = sysctl_vfs(string, &bufp, mib, flags, &type);
 		if (len >= 0) {
 			if (type == CTLTYPE_STRUCT) {
 				if (flags)
@@ -1186,7 +1182,6 @@ struct ctlname ffsname[] = FFS_NAMES;
 struct ctlname nfsname[] = FS_NFS_NAMES;
 struct ctlname fusefsname[] = FUSEFS_NAMES;
 struct list *vfsvars;
-int *vfs_typenums;
 
 /*
  * Initialize the set of filesystem names
@@ -1206,33 +1201,24 @@ vfsinit(void)
 	buflen = 4;
 	if (sysctl(mib, 3, &maxtypenum, &buflen, NULL, 0) < 0)
 		return;
-	/*
-         * We need to do 0..maxtypenum so add one, and then we offset them
-	 * all by (another) one by inserting VFS_GENERIC entries at zero
-	 */
-	maxtypenum += 2;
-	if ((vfs_typenums = calloc(maxtypenum, sizeof(int))) == NULL)
-		return;
-	if ((vfsvars = calloc(maxtypenum, sizeof(*vfsvars))) == NULL) {
-		free(vfs_typenums);
+	/* We need to do 0..maxtypenum so add one. */
+	maxtypenum++;
+	if ((vfsvars = calloc(maxtypenum, sizeof(*vfsvars))) == NULL)
 		return;
-	}
 	if ((vfsname = calloc(maxtypenum, sizeof(*vfsname))) == NULL) {
-		free(vfs_typenums);
 		free(vfsvars);
 		return;
 	}
 	mib[2] = VFS_CONF;
 	buflen = sizeof vfc;
-	for (loc = lastused, cnt = 1; cnt < maxtypenum; cnt++) {
-		mib[3] = cnt - 1;
+	for (loc = lastused, cnt = 0; cnt < maxtypenum; cnt++) {
+		mib[3] = cnt;
 		if (sysctl(mib, 4, &vfc, &buflen, NULL, 0) < 0) {
 			if (errno == EOPNOTSUPP)
 				continue;
 			warn("vfsinit");
 			free(vfsname);
 			free(vfsvars);
-			free(vfs_typenums);
 			return;
 		}
 		if (!strcmp(vfc.vfc_name, MOUNT_FFS)) {
@@ -1247,7 +1233,6 @@ vfsinit(void)
 			vfsvars[cnt].list = fusefsname;
 			vfsvars[cnt].size = FUSEFS_MAXID;
 		}
-		vfs_typenums[cnt] = vfc.vfc_typenum;
 		strlcat(&names[loc], vfc.vfc_name, sizeof names - loc);
 		vfsname[cnt].ctl_name = &names[loc];
 		vfsname[cnt].ctl_type = CTLTYPE_NODE;
@@ -1256,53 +1241,12 @@ vfsinit(void)
 	}
 	lastused = loc;
 
-	vfsname[0].ctl_name = "mounts";
-	vfsname[0].ctl_type = CTLTYPE_NODE;
-	vfsvars[0].list = vfsname + 1;
-	vfsvars[0].size = maxtypenum - 1;
-
 	secondlevel[CTL_VFS].list = vfsname;
 	secondlevel[CTL_VFS].size = maxtypenum;
 	return;
 }
 
 int
-sysctl_vfsgen(char *string, char **bufpp, int mib[], int flags, int *typep)
-{
-	int indx;
-	size_t size;
-	struct vfsconf vfc;
-
-	if (*bufpp == NULL) {
-		listall(string, vfsvars);
-		return (-1);
-	}
-
-	if ((indx = findname(string, "third", bufpp, vfsvars)) == -1)
-		return (-1);
-
-	mib[1] = VFS_GENERIC;
-	mib[2] = VFS_CONF;
-	mib[3] = indx;
-	size = sizeof vfc;
-	if (sysctl(mib, 4, &vfc, &size, NULL, 0) < 0) {
-		if (errno != EOPNOTSUPP)
-			warn("vfs print");
-		return -1;
-	}
-	if (flags == 0 && vfc.vfc_refcount == 0)
-		return -1;
-	if (!nflag)
-		fprintf(stdout, "%s has %d mounted instance%s\n",
-		    string, vfc.vfc_refcount,
-		    vfc.vfc_refcount != 1 ? "s" : "");
-	else
-		fprintf(stdout, "%d\n", vfc.vfc_refcount);
-
-	return -1;
-}
-
-int
 sysctl_vfs(char *string, char **bufpp, int mib[], int flags, int *typep)
 {
 	struct list *lp = &vfsvars[mib[1]];
@@ -1320,7 +1264,6 @@ sysctl_vfs(char *string, char **bufpp, int mib[], int flags, int *typep)
 	if ((indx = findname(string, "third", bufpp, lp)) == -1)
 		return (-1);
 
-	mib[1] = vfs_typenums[mib[1]];
 	mib[2] = indx;
 	*typep = lp->list[indx].ctl_type;
 	return (3);