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/ufs/ufs_dirhash.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/ufs/ufs/ufs_dirhash.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1.4.1
retrieving revision 1.4
diff -u -p -r1.1.4.1 -r1.4
--- src/sys/ufs/ufs/ufs_dirhash.c	2005/03/19 08:37:06	1.1.4.1
+++ src/sys/ufs/ufs/ufs_dirhash.c	2005/06/20 02:49:19	1.4
@@ -1,4 +1,4 @@
-/*	$NetBSD: ufs_dirhash.c,v 1.1.4.1 2005/03/19 08:37:06 yamt Exp $	*/
+/*	$NetBSD: ufs_dirhash.c,v 1.4 2005/06/20 02:49:19 atatat Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Ian Dowse.  All rights reserved.
@@ -780,12 +780,12 @@ ufsdirhash_dirtrunc(struct inode *ip, do
  * a directory block matches its actual contents. Panics if a mismatch
  * is detected.
  *
- * On entry, `buf' should point to the start of an in-core
+ * On entry, `sbuf' should point to the start of an in-core
  * DIRBLKSIZ-sized directory block, and `offset' should contain the
  * offset from the start of the directory of that block.
  */
 void
-ufsdirhash_checkblock(struct inode *ip, char *buf, doff_t offset)
+ufsdirhash_checkblock(struct inode *ip, char *sbuf, doff_t offset)
 {
 	struct dirhash *dh;
 	struct direct *dp;
@@ -810,7 +810,7 @@ ufsdirhash_checkblock(struct inode *ip, 
 
 	nfree = 0;
 	for (i = 0; i < dirblksiz; i += dp->d_reclen) {
-		dp = (struct direct *)(buf + i);
+		dp = (struct direct *)(sbuf + i);
 		if (dp->d_reclen == 0 || i + dp->d_reclen > dirblksiz)
 			panic("ufsdirhash_checkblock: bad dir");
 
@@ -1067,7 +1067,7 @@ ufsdirhash_done()
 
 SYSCTL_SETUP(sysctl_vfs_ufs_setup, "sysctl vfs.ufs.dirhash subtree setup")
 {
-	struct sysctlnode *rnode, *cnode;
+	const struct sysctlnode *rnode, *cnode;
 
 	sysctl_createv(clog, 0, NULL, &rnode,
 		       CTLFLAG_PERMANENT,