Module Name: src
Committed By: pgoyette
Date: Sun Nov 15 01:39:23 UTC 2015
Modified Files:
src/sys/ufs/ffs: ffs_vfsops.c
Log Message:
If file system ffs is built with WAPBL defined, make sure that the
module depends on the wapbl module.
No impact to users of built-in ffs file system code, as the WAPBL
#define will cause inclusion of the code in the kernel.
A standard build of the modular ffs file system code will #define
WAPBL, so the module will only work on a kernel which was also
built with WAPBL defined (or, once I commit it, with a dynamically-
loaded wapbl module).
To generate a diff of this commit:
cvs rdiff -u -r1.336 -r1.337 src/sys/ufs/ffs/ffs_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/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.336 src/sys/ufs/ffs/ffs_vfsops.c:1.337
--- src/sys/ufs/ffs/ffs_vfsops.c:1.336 Thu Oct 22 11:31:31 2015
+++ src/sys/ufs/ffs/ffs_vfsops.c Sun Nov 15 01:39:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.336 2015/10/22 11:31:31 maxv Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.337 2015/11/15 01:39:23 pgoyette Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.336 2015/10/22 11:31:31 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.337 2015/11/15 01:39:23 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -109,7 +109,11 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c
#include <ufs/ffs/fs.h>
#include <ufs/ffs/ffs_extern.h>
+#ifdef WAPBL
+MODULE(MODULE_CLASS_VFS, ffs, "wapbl");
+#else
MODULE(MODULE_CLASS_VFS, ffs, NULL);
+#endif
static int ffs_vfs_fsync(vnode_t *, int);
static int ffs_superblock_validate(struct fs *);
