Module Name: src
Committed By: pooka
Date: Wed Apr 21 16:51:24 UTC 2010
Modified Files:
src/sys/kern: init_main.c vfs_wapbl.c
src/sys/rump/librump/rumpvfs: rump_vfs.c
src/sys/sys: wapbl.h
Log Message:
Reduce #ifdef spew by attaching wapbl as a module.
(no, it's still too ifdef-ridden to be able to actually do anything
useful and module-like like load into any kernel)
To generate a diff of this commit:
cvs rdiff -u -r1.418 -r1.419 src/sys/kern/init_main.c
cvs rdiff -u -r1.34 -r1.35 src/sys/kern/vfs_wapbl.c
cvs rdiff -u -r1.45 -r1.46 src/sys/rump/librump/rumpvfs/rump_vfs.c
cvs rdiff -u -r1.10 -r1.11 src/sys/sys/wapbl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.418 src/sys/kern/init_main.c:1.419
--- src/sys/kern/init_main.c:1.418 Fri Feb 5 11:06:36 2010
+++ src/sys/kern/init_main.c Wed Apr 21 16:51:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.418 2010/02/05 11:06:36 cegger Exp $ */
+/* $NetBSD: init_main.c,v 1.419 2010/04/21 16:51:24 pooka Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.418 2010/02/05 11:06:36 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.419 2010/04/21 16:51:24 pooka Exp $");
#include "opt_ddb.h"
#include "opt_ipsec.h"
@@ -194,9 +194,6 @@
#include <sys/ktrace.h>
#endif
#include <sys/kauth.h>
-#ifdef WAPBL
-#include <sys/wapbl.h>
-#endif
#ifdef KERN_SA
#include <sys/savar.h>
#endif
@@ -581,11 +578,6 @@
/* Initialize the UUID system calls. */
uuid_init();
-#ifdef WAPBL
- /* Initialize write-ahead physical block logging. */
- wapbl_init();
-#endif
-
machdep_init();
/*
Index: src/sys/kern/vfs_wapbl.c
diff -u src/sys/kern/vfs_wapbl.c:1.34 src/sys/kern/vfs_wapbl.c:1.35
--- src/sys/kern/vfs_wapbl.c:1.34 Sat Feb 27 16:51:03 2010
+++ src/sys/kern/vfs_wapbl.c Wed Apr 21 16:51:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_wapbl.c,v 1.34 2010/02/27 16:51:03 mlelstv Exp $ */
+/* $NetBSD: vfs_wapbl.c,v 1.35 2010/04/21 16:51:24 pooka Exp $ */
/*-
* Copyright (c) 2003, 2008, 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#define WAPBL_INTERNAL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.34 2010/02/27 16:51:03 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.35 2010/04/21 16:51:24 pooka Exp $");
#include <sys/param.h>
#include <sys/bitops.h>
@@ -49,6 +49,7 @@
#include <sys/vnode.h>
#include <sys/file.h>
#include <sys/malloc.h>
+#include <sys/module.h>
#include <sys/resourcevar.h>
#include <sys/conf.h>
#include <sys/mount.h>
@@ -257,13 +258,6 @@
.wo_wapbl_biodone = wapbl_biodone,
};
-void
-wapbl_init(void)
-{
-
- malloc_type_attach(M_WAPBL);
-}
-
static int
wapbl_start_flush_inodes(struct wapbl *wl, struct wapbl_replay *wr)
{
@@ -2712,3 +2706,24 @@
}
return 0;
}
+
+/*
+ * This is not really a module now, but maybe on it's way to
+ * being one some day.
+ */
+MODULE(MODULE_CLASS_VFS, wapbl, NULL);
+
+static int
+wapbl_modcmd(modcmd_t cmd, void *arg)
+{
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ malloc_type_attach(M_WAPBL);
+ return 0;
+ case MODULE_CMD_FINI:
+ return EOPNOTSUPP;
+ default:
+ return ENOTTY;
+ }
+}
Index: src/sys/rump/librump/rumpvfs/rump_vfs.c
diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.45 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.46
--- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.45 Mon Apr 12 22:19:17 2010
+++ src/sys/rump/librump/rumpvfs/rump_vfs.c Wed Apr 21 16:51:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_vfs.c,v 1.45 2010/04/12 22:19:17 pooka Exp $ */
+/* $NetBSD: rump_vfs.c,v 1.46 2010/04/21 16:51:24 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.45 2010/04/12 22:19:17 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.46 2010/04/21 16:51:24 pooka Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -99,7 +99,6 @@
}
vfsinit();
bufinit();
- wapbl_init();
cwd_sys_init();
lf_init();
spec_init();
Index: src/sys/sys/wapbl.h
diff -u src/sys/sys/wapbl.h:1.10 src/sys/sys/wapbl.h:1.11
--- src/sys/sys/wapbl.h:1.10 Fri Apr 10 21:14:14 2009
+++ src/sys/sys/wapbl.h Wed Apr 21 16:51:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wapbl.h,v 1.10 2009/04/10 21:14:14 ad Exp $ */
+/* $NetBSD: wapbl.h,v 1.11 2010/04/21 16:51:24 pooka Exp $ */
/*-
* Copyright (c) 2003,2008 The NetBSD Foundation, Inc.
@@ -109,8 +109,6 @@
#endif
};
-void wapbl_init(void);
-
/* Start using a log */
int wapbl_start(struct wapbl **, struct mount *, struct vnode *, daddr_t,
size_t, size_t, struct wapbl_replay *,
