Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 12:20:13 UTC 2014
Modified Files:
src/sys/conf: files
src/sys/ufs: files.ufs
Log Message:
To make sure that I'm not doing wrong, try to define ffs/ufs/vfs dependencies
a little more strictly.
To generate a diff of this commit:
cvs rdiff -u -r1.1112 -r1.1113 src/sys/conf/files
cvs rdiff -u -r1.36 -r1.37 src/sys/ufs/files.ufs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1112 src/sys/conf/files:1.1113
--- src/sys/conf/files:1.1112 Fri Oct 10 12:10:02 2014
+++ src/sys/conf/files Fri Oct 10 12:20:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1112 2014/10/10 12:10:02 uebayasi Exp $
+# $NetBSD: files,v 1.1113 2014/10/10 12:20:13 uebayasi Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20141010
@@ -1688,38 +1688,40 @@ file kern/uipc_socket.c kern
file kern/uipc_socket2.c kern
file kern/uipc_syscalls.c kern
file kern/uipc_usrreq.c kern
-file kern/vfs_bio.c kern
-file kern/vfs_cache.c kern
-file kern/vfs_cwd.c kern
-file kern/vfs_dirhash.c kern
-file kern/vfs_getcwd.c kern
-file kern/vfs_hooks.c kern
-file kern/vfs_init.c kern
-file kern/vfs_lockf.c kern
-file kern/vfs_lookup.c kern
-file kern/vfs_mount.c kern
-file kern/vfs_quotactl.c kern
-file kern/vfs_subr.c kern
-file kern/vfs_syscalls.c kern
-file kern/vfs_trans.c kern
-file kern/vfs_vnode.c kern
-file kern/vfs_vnops.c kern
+
+define vfs: kern
+file kern/vfs_bio.c vfs
+file kern/vfs_cache.c vfs
+file kern/vfs_cwd.c vfs
+file kern/vfs_dirhash.c vfs
+file kern/vfs_getcwd.c vfs
+file kern/vfs_hooks.c vfs
+file kern/vfs_init.c vfs
+file kern/vfs_lockf.c vfs
+file kern/vfs_lookup.c vfs
+file kern/vfs_mount.c vfs
+file kern/vfs_quotactl.c vfs
+file kern/vfs_subr.c vfs
+file kern/vfs_syscalls.c vfs
+file kern/vfs_trans.c vfs
+file kern/vfs_vnode.c vfs
+file kern/vfs_vnops.c vfs
file kern/vfs_wapbl.c wapbl
-file kern/vfs_xattr.c kern
-file kern/vnode_if.c kern
-file miscfs/deadfs/dead_vfsops.c kern
-file miscfs/deadfs/dead_vnops.c kern
-file miscfs/fifofs/fifo_vnops.c kern
-file miscfs/genfs/genfs_io.c kern
-file miscfs/genfs/genfs_rename.c kern
-file miscfs/genfs/genfs_vfsops.c kern
-file miscfs/genfs/genfs_vnops.c kern
+file kern/vfs_xattr.c vfs
+file kern/vnode_if.c vfs
+file miscfs/deadfs/dead_vfsops.c vfs
+file miscfs/deadfs/dead_vnops.c vfs
+file miscfs/fifofs/fifo_vnops.c vfs
+file miscfs/genfs/genfs_io.c vfs
+file miscfs/genfs/genfs_rename.c vfs
+file miscfs/genfs/genfs_vfsops.c vfs
+file miscfs/genfs/genfs_vnops.c vfs
file miscfs/genfs/layer_subr.c nullfs | overlay | umapfs
file miscfs/genfs/layer_vfsops.c nullfs | overlay | umapfs
file miscfs/genfs/layer_vnops.c nullfs | overlay | umapfs
-file miscfs/specfs/spec_vnops.c kern
-file miscfs/syncfs/sync_subr.c kern
-file miscfs/syncfs/sync_vnops.c kern
+file miscfs/specfs/spec_vnops.c vfs
+file miscfs/syncfs/sync_subr.c vfs
+file miscfs/syncfs/sync_vnops.c vfs
file net/bpf.c bpfilter
file net/bpf_filter.c bpf_filter
Index: src/sys/ufs/files.ufs
diff -u src/sys/ufs/files.ufs:1.36 src/sys/ufs/files.ufs:1.37
--- src/sys/ufs/files.ufs:1.36 Fri May 16 09:34:03 2014
+++ src/sys/ufs/files.ufs Fri Oct 10 12:20:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.ufs,v 1.36 2014/05/16 09:34:03 dholland Exp $
+# $NetBSD: files.ufs,v 1.37 2014/10/10 12:20:13 uebayasi Exp $
deffs FFS
deffs EXT2FS
@@ -15,6 +15,7 @@ defflag opt_lfs.h LFS_EI LFS_KERNEL_RF
LFS_EXTATTR LFS_EXTATTR_AUTOSTART
LFS_QUOTA LFS_QUOTA2
+define ext2fs: vfs, ffs
file ufs/ext2fs/ext2fs_alloc.c ext2fs
file ufs/ext2fs/ext2fs_balloc.c ext2fs
file ufs/ext2fs/ext2fs_bmap.c ext2fs
@@ -27,6 +28,7 @@ file ufs/ext2fs/ext2fs_subr.c ext2fs
file ufs/ext2fs/ext2fs_vfsops.c ext2fs
file ufs/ext2fs/ext2fs_vnops.c ext2fs
+define chfs: vfs, ffs
file ufs/chfs/ebh.c chfs
file ufs/chfs/chfs_ihash.c chfs
file ufs/chfs/chfs_scan.c chfs
@@ -45,19 +47,21 @@ file ufs/chfs/chfs_subr.c chfs
file ufs/chfs/chfs_vfsops.c chfs
file ufs/chfs/chfs_readinode.c chfs
-file ufs/ffs/ffs_alloc.c ffs | mfs | ext2fs | chfs
-file ufs/ffs/ffs_balloc.c ffs | mfs | ext2fs | chfs
+define ffs: vfs, ufs
+file ufs/ffs/ffs_alloc.c ffs
+file ufs/ffs/ffs_balloc.c ffs
file ufs/ffs/ffs_bswap.c (ffs | mfs) & ffs_ei
-file ufs/ffs/ffs_inode.c ffs | mfs | ext2fs | chfs
-file ufs/ffs/ffs_snapshot.c ffs | mfs | ext2fs | chfs
-file ufs/ffs/ffs_subr.c ffs | mfs | ext2fs | chfs
-file ufs/ffs/ffs_tables.c ffs | mfs | ext2fs | chfs
-file ufs/ffs/ffs_vfsops.c ffs | mfs | ext2fs | chfs
-file ufs/ffs/ffs_vnops.c ffs | mfs | ext2fs | chfs
+file ufs/ffs/ffs_inode.c ffs
+file ufs/ffs/ffs_snapshot.c ffs
+file ufs/ffs/ffs_subr.c ffs
+file ufs/ffs/ffs_tables.c ffs
+file ufs/ffs/ffs_vfsops.c ffs
+file ufs/ffs/ffs_vnops.c ffs
file ufs/ffs/ffs_wapbl.c ffs & wapbl
file ufs/ffs/ffs_appleufs.c ffs & apple_ufs
file ufs/ffs/ffs_quota2.c quota2 & (ffs | mfs | ext2fs | chfs)
+define lfs: vfs
file ufs/lfs/lfs_alloc.c lfs
file ufs/lfs/lfs_balloc.c lfs
file ufs/lfs/lfs_bio.c lfs
@@ -88,21 +92,23 @@ file ufs/lfs/ulfs_snapshot.c lfs
file ufs/lfs/ulfs_vfsops.c lfs
file ufs/lfs/ulfs_vnops.c lfs
+define mfs: vfs, ffs
file ufs/mfs/mfs_vfsops.c mfs
file ufs/mfs/mfs_vnops.c mfs
file ufs/mfs/mfs_miniroot.c
-file ufs/ufs/ufs_bmap.c ffs | mfs | ext2fs | chfs
+define ufs: vfs
+file ufs/ufs/ufs_bmap.c ufs
file ufs/ufs/ufs_dirhash.c (ffs | mfs | ext2fs | chfs) & ufs_dirhash
file ufs/ufs/ufs_extattr.c (ffs | mfs) & ufs_extattr
file ufs/ufs/ufs_inode.c ffs | mfs | ext2fs
-file ufs/ufs/ufs_lookup.c ffs | mfs | ext2fs | chfs
+file ufs/ufs/ufs_lookup.c ufs
file ufs/ufs/ufs_quota.c (quota | quota2) & (ffs | mfs | ext2fs | chfs)
file ufs/ufs/ufs_quota1.c quota & (ffs | mfs | ext2fs | chfs)
file ufs/ufs/ufs_quota2.c quota2 & (ffs | mfs | ext2fs | chfs)
file ufs/ufs/quota1_subr.c
file ufs/ufs/quota2_subr.c quota2 & (ffs | mfs | ext2fs | chfs)
file ufs/ufs/ufs_rename.c ffs | mfs | chfs
-file ufs/ufs/ufs_vfsops.c ffs | mfs | ext2fs | chfs
-file ufs/ufs/ufs_vnops.c ffs | mfs | ext2fs | chfs
+file ufs/ufs/ufs_vfsops.c ufs
+file ufs/ufs/ufs_vnops.c ufs
file ufs/ufs/ufs_wapbl.c ffs & wapbl
