Module Name:    src
Committed By:   pgoyette
Date:           Sat Mar 21 16:30:39 UTC 2020

Modified Files:
        src/sys/miscfs/fdesc: fdesc_vfsops.c
        src/sys/miscfs/overlay: overlay_vfsops.c

Log Message:
Finish the transition to SYSCTL_SETUP by removing local sysctllog
in favor of the one provided by the module infrastructure.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/miscfs/fdesc/fdesc_vfsops.c
cvs rdiff -u -r1.69 -r1.70 src/sys/miscfs/overlay/overlay_vfsops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/miscfs/fdesc/fdesc_vfsops.c
diff -u src/sys/miscfs/fdesc/fdesc_vfsops.c:1.94 src/sys/miscfs/fdesc/fdesc_vfsops.c:1.95
--- src/sys/miscfs/fdesc/fdesc_vfsops.c:1.94	Mon Mar 16 21:20:11 2020
+++ src/sys/miscfs/fdesc/fdesc_vfsops.c	Sat Mar 21 16:30:39 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: fdesc_vfsops.c,v 1.94 2020/03/16 21:20:11 pgoyette Exp $	*/
+/*	$NetBSD: fdesc_vfsops.c,v 1.95 2020/03/21 16:30:39 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1995
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdesc_vfsops.c,v 1.94 2020/03/16 21:20:11 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdesc_vfsops.c,v 1.95 2020/03/21 16:30:39 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -68,8 +68,6 @@ MODULE(MODULE_CLASS_VFS, fdesc, NULL);
 
 VFS_PROTOS(fdesc);
 
-static struct sysctllog *fdesc_sysctl_log;
-
 /*
  * Mount the per-process file descriptors (/dev/fd)
  */
@@ -266,7 +264,7 @@ struct vfsops fdesc_vfsops = {
 SYSCTL_SETUP(fdesc_sysctl_setup, "fdesc sysctl")
 {
 
-		sysctl_createv(&fdesc_sysctl_log, 0, NULL, NULL,
+		sysctl_createv(clog, 0, NULL, NULL,
 			       CTLFLAG_PERMANENT,
 			       CTLTYPE_NODE, "fdesc",
 			       SYSCTL_DESCR("File-descriptor file system"),

Index: src/sys/miscfs/overlay/overlay_vfsops.c
diff -u src/sys/miscfs/overlay/overlay_vfsops.c:1.69 src/sys/miscfs/overlay/overlay_vfsops.c:1.70
--- src/sys/miscfs/overlay/overlay_vfsops.c:1.69	Mon Mar 16 21:20:11 2020
+++ src/sys/miscfs/overlay/overlay_vfsops.c	Sat Mar 21 16:30:39 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: overlay_vfsops.c,v 1.69 2020/03/16 21:20:11 pgoyette Exp $	*/
+/*	$NetBSD: overlay_vfsops.c,v 1.70 2020/03/21 16:30:39 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 National Aeronautics & Space Administration
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: overlay_vfsops.c,v 1.69 2020/03/16 21:20:11 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: overlay_vfsops.c,v 1.70 2020/03/21 16:30:39 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -92,8 +92,6 @@ MODULE(MODULE_CLASS_VFS, overlay, "layer
 
 VFS_PROTOS(ov);
 
-static struct sysctllog *overlay_sysctl_log;
-
 #define	NOVERLAYNODECACHE	16
 
 /*
@@ -273,7 +271,7 @@ struct vfsops overlay_vfsops = {
 SYSCTL_SETUP(overlay_sysctl_setup, "overlay fs sysctl")
 {
 
-	sysctl_createv(&overlay_sysctl_log, 0, NULL, NULL,
+	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT, CTLTYPE_NODE, "overlay",
 		       SYSCTL_DESCR("Overlay file system"),
 		       NULL, 0, NULL, 0,

Reply via email to