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

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/ufs/files.ufs,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/ufs/files.ufs,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.36.2.1
retrieving revision 1.37
diff -u -p -r1.36.2.1 -r1.37
--- src/sys/ufs/files.ufs	2014/11/18 19:05:32	1.36.2.1
+++ src/sys/ufs/files.ufs	2014/10/10 12:20:13	1.37
@@ -1,4 +1,4 @@
-#	$NetBSD: files.ufs,v 1.36.2.1 2014/11/18 19:05:32 snj Exp $
+#	$NetBSD: files.ufs,v 1.37 2014/10/10 12:20:13 uebayasi Exp $
 
 deffs					FFS
 deffs					EXT2FS
@@ -7,12 +7,15 @@ deffs					LFS
 deffs					CHFS
 
 defflag	opt_ffs.h			FFS_EI FFS_NO_SNAPSHOT APPLE_UFS
-					UFS_DIRHASH UFS_EXTATTR
+					UFS_DIRHASH
+					UFS_EXTATTR UFS_EXTATTR_AUTOSTART
 
 defflag	opt_lfs.h			LFS_EI LFS_KERNEL_RFW
-					LFS_DIRHASH LFS_EXTATTR
+					LFS_DIRHASH
+					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
@@ -25,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
@@ -43,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
@@ -86,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