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/ffs/ffs_subr.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/ufs/ffs/ffs_subr.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.41.18.2
retrieving revision 1.42
diff -u -p -r1.41.18.2 -r1.42
--- src/sys/ufs/ffs/ffs_subr.c	2007/02/01 08:48:48	1.41.18.2
+++ src/sys/ufs/ffs/ffs_subr.c	2006/10/12 01:32:51	1.42
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_subr.c,v 1.41.18.2 2007/02/01 08:48:48 ad Exp $	*/
+/*	$NetBSD: ffs_subr.c,v 1.42 2006/10/12 01:32:51 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -36,7 +36,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.41.18.2 2007/02/01 08:48:48 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.42 2006/10/12 01:32:51 christos Exp $");
 
 #include <sys/param.h>
 
@@ -44,12 +44,11 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v
 extern const int inside[], around[];
 extern const u_char * const fragtbl[];
 
+#ifndef _KERNEL
+#include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 #include <ufs/ufs/ufs_bswap.h>
-
-#ifndef _KERNEL
-#include <ufs/ufs/dinode.h>
 void    panic(const char *, ...)
     __attribute__((__noreturn__,__format__(__printf__,1,2)));
 
@@ -63,6 +62,9 @@ void    panic(const char *, ...)
 #include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
+#include <ufs/ffs/fs.h>
+#include <ufs/ffs/ffs_extern.h>
+#include <ufs/ufs/ufs_bswap.h>
 
 /*
  * Load up the contents of an inode and copy the appropriate pieces
@@ -117,7 +119,7 @@ ffs_load_inode(struct buf *bp, struct in
  */
 void
 ffs_fragacct(struct fs *fs, int fragmap, int32_t fraglist[], int cnt,
-    int needswap)
+    int needswap __unused)
 {
 	int inblk;
 	int field, subfield;