Module Name: src
Committed By: pgoyette
Date: Thu Jun 20 03:31:30 UTC 2019
Modified Files:
src/sys/modules: Makefile
src/sys/modules/ffs: Makefile
src/sys/ufs/chfs: chfs_vfsops.c
src/sys/ufs/ext2fs: ext2fs_vfsops.c
src/sys/ufs/ffs: ffs_vfsops.c
src/sys/ufs/ufs: ufs_vfsops.c
Added Files:
src/sys/modules/ufs: Makefile
Log Message:
Split the ufs code out of the ffs module and into its own module.
Adapt chfs and ext2fs modules accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 src/sys/modules/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sys/modules/ffs/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/ufs/Makefile
cvs rdiff -u -r1.18 -r1.19 src/sys/ufs/chfs/chfs_vfsops.c
cvs rdiff -u -r1.213 -r1.214 src/sys/ufs/ext2fs/ext2fs_vfsops.c
cvs rdiff -u -r1.361 -r1.362 src/sys/ufs/ffs/ffs_vfsops.c
cvs rdiff -u -r1.56 -r1.57 src/sys/ufs/ufs/ufs_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/modules/Makefile
diff -u src/sys/modules/Makefile:1.221 src/sys/modules/Makefile:1.222
--- src/sys/modules/Makefile:1.221 Tue Mar 26 00:36:14 2019
+++ src/sys/modules/Makefile Thu Jun 20 03:31:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.221 2019/03/26 00:36:14 pgoyette Exp $
+# $NetBSD: Makefile,v 1.222 2019/06/20 03:31:29 pgoyette Exp $
.include <bsd.own.mk>
@@ -160,6 +160,7 @@ SUBDIR+= tmpfs
SUBDIR+= ualea
SUBDIR+= uatp
SUBDIR+= udf
+SUBDIR+= ufs
SUBDIR+= umap
SUBDIR+= union
SUBDIR+= usbverbose
Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.11 src/sys/modules/ffs/Makefile:1.12
--- src/sys/modules/ffs/Makefile:1.11 Mon Jun 17 03:32:14 2019
+++ src/sys/modules/ffs/Makefile Thu Jun 20 03:31:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/06/17 03:32:14 christos Exp $
+# $NetBSD: Makefile,v 1.12 2019/06/20 03:31:29 pgoyette Exp $
.include "../Makefile.inc"
@@ -9,12 +9,6 @@ CPPFLAGS+= -DUFS_DIRHASH -DFFS_EI -
CWARNFLAGS.clang= -Wno-conversion
-.PATH: ${S}/ufs/ufs
-SRCS= ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_inode.c \
- ufs_lookup.c ufs_quota.c ufs_quota1.c ufs_quota2.c ufs_rename.c \
- ufs_vfsops.c ufs_vnops.c ufs_wapbl.c quota1_subr.c quota2_subr.c
-
-.PATH: ${S}/ufs/ffs
SRCS+= ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_subr.c ffs_tables.c \
ffs_vfsops.c ffs_vnops.c ffs_snapshot.c \
ffs_bswap.c ffs_wapbl.c ffs_appleufs.c ffs_quota2.c
Index: src/sys/ufs/chfs/chfs_vfsops.c
diff -u src/sys/ufs/chfs/chfs_vfsops.c:1.18 src/sys/ufs/chfs/chfs_vfsops.c:1.19
--- src/sys/ufs/chfs/chfs_vfsops.c:1.18 Mon May 28 21:04:38 2018
+++ src/sys/ufs/chfs/chfs_vfsops.c Thu Jun 20 03:31:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_vfsops.c,v 1.18 2018/05/28 21:04:38 chs Exp $ */
+/* $NetBSD: chfs_vfsops.c,v 1.19 2019/06/20 03:31:30 pgoyette Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -62,8 +62,6 @@
#include "chfs.h"
#include "chfs_args.h"
-MODULE(MODULE_CLASS_VFS, chfs, "flash");
-
/* --------------------------------------------------------------------- */
/* functions */
@@ -827,6 +825,9 @@ struct vfsops chfs_vfsops = {
};
/* For using CHFS as a module. */
+
+MODULE(MODULE_CLASS_VFS, chfs, "ufs,flash");
+
static int
chfs_modcmd(modcmd_t cmd, void *arg)
{
Index: src/sys/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.213 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.214
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.213 Tue Jan 1 10:06:55 2019
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Thu Jun 20 03:31:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vfsops.c,v 1.213 2019/01/01 10:06:55 hannken Exp $ */
+/* $NetBSD: ext2fs_vfsops.c,v 1.214 2019/06/20 03:31:30 pgoyette Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.213 2019/01/01 10:06:55 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.214 2019/06/20 03:31:30 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -100,7 +100,7 @@ __KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsop
#include <ufs/ext2fs/ext2fs_dir.h>
#include <ufs/ext2fs/ext2fs_extern.h>
-MODULE(MODULE_CLASS_VFS, ext2fs, "ffs");
+MODULE(MODULE_CLASS_VFS, ext2fs, "ufs");
int ext2fs_sbupdate(struct ufsmount *, int);
static int ext2fs_sbfill(struct m_ext2fs *, int);
Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.361 src/sys/ufs/ffs/ffs_vfsops.c:1.362
--- src/sys/ufs/ffs/ffs_vfsops.c:1.361 Tue Jan 1 10:06:55 2019
+++ src/sys/ufs/ffs/ffs_vfsops.c Thu Jun 20 03:31:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.361 2019/01/01 10:06:55 hannken Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.362 2019/06/20 03:31:30 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.361 2019/01/01 10:06:55 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.362 2019/06/20 03:31:30 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -108,9 +108,9 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c
#include <ufs/ffs/ffs_extern.h>
#ifdef WAPBL
-MODULE(MODULE_CLASS_VFS, ffs, "wapbl");
+MODULE(MODULE_CLASS_VFS, ffs, "ufs,wapbl");
#else
-MODULE(MODULE_CLASS_VFS, ffs, NULL);
+MODULE(MODULE_CLASS_VFS, ffs, "ufs");
#endif
static int ffs_vfs_fsync(vnode_t *, int);
Index: src/sys/ufs/ufs/ufs_vfsops.c
diff -u src/sys/ufs/ufs/ufs_vfsops.c:1.56 src/sys/ufs/ufs/ufs_vfsops.c:1.57
--- src/sys/ufs/ufs/ufs_vfsops.c:1.56 Mon Dec 10 14:46:25 2018
+++ src/sys/ufs/ufs/ufs_vfsops.c Thu Jun 20 03:31:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_vfsops.c,v 1.56 2018/12/10 14:46:25 maxv Exp $ */
+/* $NetBSD: ufs_vfsops.c,v 1.57 2019/06/20 03:31:30 pgoyette Exp $ */
/*
* Copyright (c) 1991, 1993, 1994
@@ -37,17 +37,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.56 2018/12/10 14:46:25 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.57 2019/06/20 03:31:30 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
#include "opt_quota.h"
+#include "opt_wapbl.h"
#endif
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/proc.h>
#include <sys/buf.h>
+#include <sys/module.h>
#include <sys/vnode.h>
#include <sys/kmem.h>
#include <sys/kauth.h>
@@ -305,3 +307,35 @@ ufs_done(void)
ufs_extattr_done();
#endif
}
+
+/*
+ * module interface
+ */
+
+#ifdef WAPBL
+MODULE(MODULE_CLASS_MISC, ufs, "wapbl");
+#else
+MODULE(MODULE_CLASS_MISC, ufs, NULL);
+#endif
+
+static int
+ufs_modcmd(modcmd_t cmd, void *arg)
+{
+ int error;
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ ufs_init();
+ error = 0;
+ break;
+ case MODULE_CMD_FINI:
+ ufs_done();
+ error = 0;
+ break;
+ default:
+ error = ENOTTY;
+ break;
+ }
+
+ return error;
+}
Added files:
Index: src/sys/modules/ufs/Makefile
diff -u /dev/null src/sys/modules/ufs/Makefile:1.1
--- /dev/null Thu Jun 20 03:31:30 2019
+++ src/sys/modules/ufs/Makefile Thu Jun 20 03:31:30 2019
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2019/06/20 03:31:30 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+KMOD= ufs
+
+CPPFLAGS+= -DUFS_DIRHASH -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
+
+CWARNFLAGS.clang= -Wno-conversion
+
+.PATH: ${S}/ufs/ufs
+SRCS= ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_inode.c \
+ ufs_lookup.c ufs_quota.c ufs_quota1.c ufs_quota2.c ufs_rename.c \
+ ufs_vfsops.c ufs_vnops.c ufs_wapbl.c quota1_subr.c quota2_subr.c
+
+WARNS= 3
+
+.include <bsd.kmodule.mk>
