From a40549facabc745fa3a06339af00f689aa6b3ddb Mon Sep 17 00:00:00 2001
From: pooka <pooka@NetBSD.org>
Date: Tue, 14 Nov 2006 11:45:03 +0000
Subject: [PATCH] namespace previous change under puffs_vfsnop to avoid
 confusions

---
 lib/libpuffs/puffs.h | 11 +++++------
 lib/libpuffs/subr.c  | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/libpuffs/puffs.h b/lib/libpuffs/puffs.h
index fa47845e27fe..96a09453d6cc 100644
--- a/lib/libpuffs/puffs.h
+++ b/lib/libpuffs/puffs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs.h,v 1.6 2006/11/14 11:23:44 pooka Exp $	*/
+/*	$NetBSD: puffs.h,v 1.7 2006/11/14 11:45:03 pooka Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006  Antti Kantee.  All Rights Reserved.
@@ -195,11 +195,10 @@ struct puffs_node *	puffs_newpnode(struct puffs_usermount *, void *,
 void		puffs_putpnode(struct puffs_node *);
 void		puffs_setvattr(struct vattr *, const struct vattr *);
 
-int puffs_unmount(struct puffs_usermount *, int, pid_t);
-int puffs_statvfs(struct puffs_usermount *, struct statvfs *, pid_t);
-int puffs_sync(struct puffs_usermount *, int waitfor,
-	       const struct puffs_cred *, pid_t);
-
+int puffs_vfsnop_unmount(struct puffs_usermount *, int, pid_t);
+int puffs_vfsnop_statvfs(struct puffs_usermount *, struct statvfs *, pid_t);
+int puffs_vfsnop_sync(struct puffs_usermount *, int waitfor,
+		      const struct puffs_cred *, pid_t);
 
 #define		DENT_DOT	0
 #define		DENT_DOTDOT	1
diff --git a/lib/libpuffs/subr.c b/lib/libpuffs/subr.c
index 3e8e68f239dc..b841013dfc0a 100644
--- a/lib/libpuffs/subr.c
+++ b/lib/libpuffs/subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr.c,v 1.7 2006/11/14 11:23:44 pooka Exp $	*/
+/*	$NetBSD: subr.c,v 1.8 2006/11/14 11:45:03 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006 Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: subr.c,v 1.7 2006/11/14 11:23:44 pooka Exp $");
+__RCSID("$NetBSD: subr.c,v 1.8 2006/11/14 11:45:03 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
@@ -118,7 +118,7 @@ puffs_nextdent(struct dirent **dent, const char *name, ino_t id, uint8_t dtype,
 
 /*ARGSUSED*/
 int
-puffs_unmount(struct puffs_usermount *pu, int flags, pid_t pid)
+puffs_vfsnop_unmount(struct puffs_usermount *pu, int flags, pid_t pid)
 {
 
 	/* would you like to see puffs rule again, my friend? */
@@ -127,7 +127,7 @@ puffs_unmount(struct puffs_usermount *pu, int flags, pid_t pid)
 
 /*ARGSUSED*/
 int
-puffs_sync(struct puffs_usermount *pu, int waitfor,
+puffs_vfsnop_sync(struct puffs_usermount *pu, int waitfor,
 	const struct puffs_cred *cred, pid_t pid)
 {
 
@@ -136,7 +136,7 @@ puffs_sync(struct puffs_usermount *pu, int waitfor,
 
 /*ARGSUSED*/
 int
-puffs_statvfs(struct puffs_usermount *pu, struct statvfs *sbp, pid_t pid)
+puffs_vfsnop_statvfs(struct puffs_usermount *pu, struct statvfs *sbp, pid_t pid)
 {
 
 	sbp->f_bsize = sbp->f_frsize = sbp->f_iosize = 512;