From e6d6dce9bf3e9402baf65c7ce45adce637cbcd5e Mon Sep 17 00:00:00 2001
From: pooka <pooka@NetBSD.org>
Date: Wed, 22 Aug 2007 17:54:30 +0000
Subject: [PATCH] Mimic namei structure changes for puffs.  bump both kernel &
 lib version.

---
 lib/libpuffs/puffs.h       |  4 ++--
 sys/fs/puffs/puffs_msgif.h | 12 ++++++------
 sys/fs/puffs/puffs_vnops.c |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/libpuffs/puffs.h b/lib/libpuffs/puffs.h
index f4f736b5512e..00d5806c3c01 100644
--- a/lib/libpuffs/puffs.h
+++ b/lib/libpuffs/puffs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs.h,v 1.80 2007/08/18 10:26:05 pooka Exp $	*/
+/*	$NetBSD: puffs.h,v 1.81 2007/08/22 17:54:30 pooka Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -387,7 +387,7 @@ enum {
 
 PUFFSOP_PROTOS(puffs_null)	/* XXX */
 
-#define PUFFS_DEVEL_LIBVERSION 25
+#define PUFFS_DEVEL_LIBVERSION 26
 #define puffs_init(a,b,c,d,e) \
     _puffs_init(PUFFS_DEVEL_LIBVERSION,a,b,c,d,e)
 
diff --git a/sys/fs/puffs/puffs_msgif.h b/sys/fs/puffs/puffs_msgif.h
index 8438f0bd191b..534068f1a097 100644
--- a/sys/fs/puffs/puffs_msgif.h
+++ b/sys/fs/puffs/puffs_msgif.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_msgif.h,v 1.48 2007/08/15 14:19:19 pooka Exp $	*/
+/*	$NetBSD: puffs_msgif.h,v 1.49 2007/08/22 17:54:31 pooka Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006  Antti Kantee.  All Rights Reserved.
@@ -85,7 +85,7 @@ enum {
 #define PUFFS_VN_MAX PUFFS_VN_SETEXTATTR
 
 #define PUFFSDEVELVERS	0x80000000
-#define PUFFSVERSION	16
+#define PUFFSVERSION	17
 #define PUFFSNAMESIZE	32
 
 #define PUFFS_TYPEPREFIX "puffs|"
@@ -350,12 +350,12 @@ struct puffs_kcid {
 /* puffs struct componentname built by kernel */
 struct puffs_kcn {
 	/* args */
-	u_long			pkcn_nameiop;	/* namei operation	*/
-	u_long			pkcn_flags;	/* flags		*/
+	uint32_t		pkcn_nameiop;	/* namei operation	*/
+	uint32_t		pkcn_flags;	/* flags		*/
 
 	char pkcn_name[MAXPATHLEN];	/* nulterminated path component */
-	long pkcn_namelen;		/* current component length	*/
-	long pkcn_consume;		/* IN: extra chars server ate   */
+	size_t pkcn_namelen;		/* current component length	*/
+	size_t pkcn_consume;		/* IN: extra chars server ate   */
 };
 
 
diff --git a/sys/fs/puffs/puffs_vnops.c b/sys/fs/puffs/puffs_vnops.c
index 8b863dfe2a5e..3adabd945e74 100644
--- a/sys/fs/puffs/puffs_vnops.c
+++ b/sys/fs/puffs/puffs_vnops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_vnops.c,v 1.97 2007/08/13 09:48:55 pooka Exp $	*/
+/*	$NetBSD: puffs_vnops.c,v 1.98 2007/08/22 17:54:31 pooka Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.97 2007/08/13 09:48:55 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.98 2007/08/22 17:54:31 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/fstrans.h>
@@ -437,7 +437,7 @@ puffs_lookup(void *v)
 
 	isdot = cnp->cn_namelen == 1 && *cnp->cn_nameptr == '.';
 
-	DPRINTF(("puffs_lookup: \"%s\", parent vnode %p, op: %lx\n",
+	DPRINTF(("puffs_lookup: \"%s\", parent vnode %p, op: %x\n",
 	    cnp->cn_nameptr, dvp, cnp->cn_nameiop));
 
 	/*