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.4
retrieving revision 1.4.2.2
diff -u -p -r1.4 -r1.4.2.2
--- src/sys/ufs/files.ufs	2005/01/23 19:37:05	1.4
+++ src/sys/ufs/files.ufs	2005/03/19 08:37:03	1.4.2.2
@@ -1,11 +1,11 @@
-#	$NetBSD: files.ufs,v 1.4 2005/01/23 19:37:05 rumble Exp $
+#	$NetBSD: files.ufs,v 1.4.2.2 2005/03/19 08:37:03 yamt Exp $
 
 deffs					FFS
 deffs					EXT2FS
 deffs	fs_mfs.h			MFS		# XXX
 deffs	fs_lfs.h			LFS		# XXX
 
-defflag	opt_ffs.h			FFS_EI APPLE_UFS FFS_SNAPSHOT
+defflag	opt_ffs.h			FFS_EI FFS_NO_SNAPSHOT APPLE_UFS
 
 file	ufs/ext2fs/ext2fs_alloc.c	ext2fs
 file	ufs/ext2fs/ext2fs_balloc.c	ext2fs
@@ -22,9 +22,7 @@ file	ufs/ffs/ffs_alloc.c		ffs | mfs
 file	ufs/ffs/ffs_balloc.c		ffs | mfs
 file	ufs/ffs/ffs_bswap.c		(ffs | mfs) & ffs_ei
 file	ufs/ffs/ffs_inode.c		ffs | mfs
-file	ufs/ffs/ffs_snapshot.c		ffs & ffs_snapshot
-file	ufs/ffs/ffs_snapshot.stub.c	(ffs & !ffs_snapshot) |
-					    (!ffs & (lfs | mfs | ext2fs))
+file	ufs/ffs/ffs_snapshot.c		ffs | mfs
 file	ufs/ffs/ffs_softdep.c		ffs & softdep
 file	ufs/ffs/ffs_softdep.stub.c	(ffs & !softdep) |
 					    (!ffs & (lfs | mfs | ext2fs))
@@ -34,7 +32,7 @@ file	ufs/ffs/ffs_vfsops.c		ffs | mfs
 file	ufs/ffs/ffs_vnops.c		ffs | mfs
 file	ufs/ffs/ffs_appleufs.c		ffs & apple_ufs
 
-file	ufs/lfs/lfs_alloc.c		lfs  
+file	ufs/lfs/lfs_alloc.c		lfs
 file	ufs/lfs/lfs_balloc.c		lfs
 file	ufs/lfs/lfs_bio.c		lfs
 file	ufs/lfs/lfs_cksum.c		lfs