add fuse sysctls, from Sylvestre Gallon

2 files changed, 16 insertions, 3 deletions

diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index b851aaf020c..7e94bbd033c 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.8,v 1.170 2013/06/08 14:24:39 yasuoka Exp $
+.\"	$OpenBSD: sysctl.8,v 1.171 2013/06/09 12:54:38 tedu Exp $
 .\"	$NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $
 .\"
 .\" Copyright (c) 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)sysctl.8	8.2 (Berkeley) 5/9/95
 .\"
-.Dd $Mdocdate: June 8 2013 $
+.Dd $Mdocdate: June 9 2013 $
 .Dt SYSCTL 8
 .Os
 .Sh NAME
@@ -405,6 +405,10 @@ and a few require a kernel compiled with non-standard
 .It vfs.ffs.dirhash_maxmem Ta integer Ta yes
 .It vfs.ffs.dirhash_mem Ta integer Ta no
 .It vfs.nfs.iothreads Ta integer Ta yes
+.It vfs.fuse.fusefs_open_devices Ta integer Ta no
+.It vfs.fuse.fusefs_fbufs_in Ta integer Ta no
+.It vfs.fuse.fusefs_fbufs_wait Ta integer Ta no
+.It vfs.fuse.fusefs_pool_pages Ta integer Ta no
 .El
 .Pp
 The
@@ -455,6 +459,8 @@ definitions for second level ddb identifiers
 definitions for second level vfs identifiers
 .It Aq Pa nfs/nfs.h
 definitions for third level NFS identifiers
+.It Aq Pa miscfs/fuse/fusefs.h
+definitions for third level fusefs identifiers
 .It Aq Pa ufs/ffs/ffs_extern.h
 definitions for third level FFS identifiers
 .It Aq Pa machine/cpu.h
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 035e2dfa53b..291e3173d42 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysctl.c,v 1.191 2013/06/09 12:37:43 tedu Exp $	*/
+/*	$OpenBSD: sysctl.c,v 1.192 2013/06/09 12:54:38 tedu Exp $	*/
 /*	$NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $	*/
 
 /*
@@ -88,6 +88,8 @@
 #include <ufs/ufs/inode.h>
 #include <ufs/ffs/ffs_extern.h>
 
+#include <miscfs/fuse/fusefs.h>
+
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
 
@@ -1103,6 +1105,7 @@ debuginit(void)
 struct ctlname vfsgennames[] = CTL_VFSGENCTL_NAMES;
 struct ctlname ffsname[] = FFS_NAMES;
 struct ctlname nfsname[] = FS_NFS_NAMES;
+struct ctlname fusefsname[] = FUSEFS_NAMES;
 struct list *vfsvars;
 int *vfs_typenums;
 
@@ -1157,6 +1160,10 @@ vfsinit(void)
 			vfsvars[cnt].list = nfsname;
 			vfsvars[cnt].size = NFS_MAXID;
 		}
+		if (!strcmp(vfc.vfc_name, MOUNT_FUSEFS)) {
+			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];