summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpooka <pooka@NetBSD.org>2008-08-12 19:44:39 +0000
committerpooka <pooka@NetBSD.org>2008-08-12 19:44:39 +0000
commitff42332733a25dee37ede35e6f815d94de2e0f6a (patch)
treef1c298a7335ba3e46574130e72365e9712e81d05
parenta52c17ad61303dd549ec92342fabfea56ae9c777 (diff)
Replace void * by puffs_cookie_t where appropriate. No functional change.
-rw-r--r--lib/libpuffs/dispatcher.c6
-rw-r--r--lib/libpuffs/flush.c22
-rw-r--r--lib/libpuffs/null.c55
-rw-r--r--lib/libpuffs/opdump.c6
-rw-r--r--lib/libpuffs/paths.c6
-rw-r--r--lib/libpuffs/pnode.c6
-rw-r--r--lib/libpuffs/puffs.34
-rw-r--r--lib/libpuffs/puffs.c8
-rw-r--r--lib/libpuffs/puffs.h171
-rw-r--r--lib/libpuffs/puffs_flush.320
-rw-r--r--lib/libpuffs/puffs_ops.379
-rw-r--r--lib/libpuffs/puffsdump.h4
-rw-r--r--lib/libpuffs/subr.c8
13 files changed, 209 insertions, 186 deletions
diff --git a/lib/libpuffs/dispatcher.c b/lib/libpuffs/dispatcher.c
index ad35de83102..ba0b3766379 100644
--- a/lib/libpuffs/dispatcher.c
+++ b/lib/libpuffs/dispatcher.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dispatcher.c,v 1.31 2008/03/20 15:28:03 pooka Exp $ */
+/* $NetBSD: dispatcher.c,v 1.32 2008/08/12 19:44:39 pooka Exp $ */
/*
* Copyright (c) 2006, 2007, 2008 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: dispatcher.c,v 1.31 2008/03/20 15:28:03 pooka Exp $");
+__RCSID("$NetBSD: dispatcher.c,v 1.32 2008/08/12 19:44:39 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -134,7 +134,7 @@ dispatch(struct puffs_cc *pcc)
struct puffs_ops *pops = &pu->pu_ops;
struct puffs_req *preq = puffs__framebuf_getdataptr(pcc->pcc_pb);
void *auxbuf; /* help with typecasting */
- void *opcookie;
+ puffs_cookie_t opcookie;
int error = 0, buildpath;
/* XXX: smaller hammer, please */
diff --git a/lib/libpuffs/flush.c b/lib/libpuffs/flush.c
index 96146938e6f..51d3db32f36 100644
--- a/lib/libpuffs/flush.c
+++ b/lib/libpuffs/flush.c
@@ -1,4 +1,4 @@
-/* $NetBSD: flush.c,v 1.15 2007/12/05 18:55:19 pooka Exp $ */
+/* $NetBSD: flush.c,v 1.16 2008/08/12 19:44:39 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: flush.c,v 1.15 2007/12/05 18:55:19 pooka Exp $");
+__RCSID("$NetBSD: flush.c,v 1.16 2008/08/12 19:44:39 pooka Exp $");
#endif /* !lint */
/*
@@ -47,7 +47,7 @@ __RCSID("$NetBSD: flush.c,v 1.15 2007/12/05 18:55:19 pooka Exp $");
#if 0
int
-puffs_inval_namecache_node(struct puffs_usermount *pu, void *cookie,
+puffs_inval_namecache_node(struct puffs_usermount *pu, puffs_cookie_t cookie,
const char *name)
{
@@ -56,7 +56,7 @@ puffs_inval_namecache_node(struct puffs_usermount *pu, void *cookie,
#endif
static int
-doflush(struct puffs_usermount *pu, void *cookie, int op,
+doflush(struct puffs_usermount *pu, puffs_cookie_t cookie, int op,
off_t start, off_t end)
{
struct puffs_framebuf *pb;
@@ -91,7 +91,7 @@ doflush(struct puffs_usermount *pu, void *cookie, int op,
}
int
-puffs_inval_namecache_dir(struct puffs_usermount *pu, void *cookie)
+puffs_inval_namecache_dir(struct puffs_usermount *pu, puffs_cookie_t cookie)
{
return doflush(pu, cookie, PUFFS_INVAL_NAMECACHE_DIR, 0, 0);
@@ -105,30 +105,30 @@ puffs_inval_namecache_all(struct puffs_usermount *pu)
}
int
-puffs_inval_pagecache_node(struct puffs_usermount *pu, void *cookie)
+puffs_inval_pagecache_node(struct puffs_usermount *pu, puffs_cookie_t cookie)
{
return doflush(pu, cookie, PUFFS_INVAL_PAGECACHE_NODE_RANGE, 0, 0);
}
int
-puffs_inval_pagecache_node_range(struct puffs_usermount *pu, void *cookie,
- off_t start, off_t end)
+puffs_inval_pagecache_node_range(struct puffs_usermount *pu,
+ puffs_cookie_t cookie, off_t start, off_t end)
{
return doflush(pu, cookie, PUFFS_INVAL_PAGECACHE_NODE_RANGE, start,end);
}
int
-puffs_flush_pagecache_node(struct puffs_usermount *pu, void *cookie)
+puffs_flush_pagecache_node(struct puffs_usermount *pu, puffs_cookie_t cookie)
{
return doflush(pu, cookie, PUFFS_FLUSH_PAGECACHE_NODE_RANGE, 0, 0);
}
int
-puffs_flush_pagecache_node_range(struct puffs_usermount *pu, void *cookie,
- off_t start, off_t end)
+puffs_flush_pagecache_node_range(struct puffs_usermount *pu,
+ puffs_cookie_t cookie, off_t start, off_t end)
{
return doflush(pu, cookie, PUFFS_FLUSH_PAGECACHE_NODE_RANGE, start,end);
diff --git a/lib/libpuffs/null.c b/lib/libpuffs/null.c
index a447419c485..145efefa512 100644
--- a/lib/libpuffs/null.c
+++ b/lib/libpuffs/null.c
@@ -1,4 +1,4 @@
-/* $NetBSD: null.c,v 1.24 2007/11/30 19:02:28 pooka Exp $ */
+/* $NetBSD: null.c,v 1.25 2008/08/12 19:44:39 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: null.c,v 1.24 2007/11/30 19:02:28 pooka Exp $");
+__RCSID("$NetBSD: null.c,v 1.25 2008/08/12 19:44:39 pooka Exp $");
#endif /* !lint */
/*
@@ -197,7 +197,7 @@ puffs_null_fs_statvfs(struct puffs_usermount *pu, struct statvfs *svfsb)
}
int
-puffs_null_node_lookup(struct puffs_usermount *pu, void *opc,
+puffs_null_node_lookup(struct puffs_usermount *pu, puffs_cookie_t opc,
struct puffs_newinfo *pni, const struct puffs_cn *pcn)
{
struct puffs_node *pn = opc, *pn_res;
@@ -236,7 +236,7 @@ puffs_null_node_lookup(struct puffs_usermount *pu, void *opc,
/*ARGSUSED*/
int
-puffs_null_node_create(struct puffs_usermount *pu, void *opc,
+puffs_null_node_create(struct puffs_usermount *pu, puffs_cookie_t opc,
struct puffs_newinfo *pni, const struct puffs_cn *pcn,
const struct vattr *va)
{
@@ -255,7 +255,7 @@ puffs_null_node_create(struct puffs_usermount *pu, void *opc,
/*ARGSUSED*/
int
-puffs_null_node_mknod(struct puffs_usermount *pu, void *opc,
+puffs_null_node_mknod(struct puffs_usermount *pu, puffs_cookie_t opc,
struct puffs_newinfo *pni, const struct puffs_cn *pcn,
const struct vattr *va)
{
@@ -274,8 +274,8 @@ puffs_null_node_mknod(struct puffs_usermount *pu, void *opc,
/*ARGSUSED*/
int
-puffs_null_node_getattr(struct puffs_usermount *pu, void *opc, struct vattr *va,
- const struct puffs_cred *pcred)
+puffs_null_node_getattr(struct puffs_usermount *pu, puffs_cookie_t opc,
+ struct vattr *va, const struct puffs_cred *pcred)
{
struct puffs_node *pn = opc;
struct stat sb;
@@ -289,7 +289,7 @@ puffs_null_node_getattr(struct puffs_usermount *pu, void *opc, struct vattr *va,
/*ARGSUSED*/
int
-puffs_null_node_setattr(struct puffs_usermount *pu, void *opc,
+puffs_null_node_setattr(struct puffs_usermount *pu, puffs_cookie_t opc,
const struct vattr *va, const struct puffs_cred *pcred)
{
struct puffs_node *pn = opc;
@@ -306,7 +306,7 @@ puffs_null_node_setattr(struct puffs_usermount *pu, void *opc,
/*ARGSUSED*/
int
-puffs_null_node_fsync(struct puffs_usermount *pu, void *opc,
+puffs_null_node_fsync(struct puffs_usermount *pu, puffs_cookie_t opc,
const struct puffs_cred *pcred, int how,
off_t offlo, off_t offhi)
{
@@ -336,8 +336,8 @@ puffs_null_node_fsync(struct puffs_usermount *pu, void *opc,
/*ARGSUSED*/
int
-puffs_null_node_remove(struct puffs_usermount *pu, void *opc, void *targ,
- const struct puffs_cn *pcn)
+puffs_null_node_remove(struct puffs_usermount *pu, puffs_cookie_t opc,
+ puffs_cookie_t targ, const struct puffs_cn *pcn)
{
struct puffs_node *pn_targ = targ;
@@ -350,8 +350,8 @@ puffs_null_node_remove(struct puffs_usermount *pu, void *opc, void *targ,
/*ARGSUSED*/
int
-puffs_null_node_link(struct puffs_usermount *pu, void *opc, void *targ,
- const struct puffs_cn *pcn)
+puffs_null_node_link(struct puffs_usermount *pu, puffs_cookie_t opc,
+ puffs_cookie_t targ, const struct puffs_cn *pcn)
{
struct puffs_node *pn_targ = targ;
@@ -363,8 +363,9 @@ puffs_null_node_link(struct puffs_usermount *pu, void *opc, void *targ,
/*ARGSUSED*/
int
-puffs_null_node_rename(struct puffs_usermount *pu, void *opc, void *src,
- const struct puffs_cn *pcn_src, void *targ_dir, void *targ,
+puffs_null_node_rename(struct puffs_usermount *pu, puffs_cookie_t opc,
+ puffs_cookie_t src, const struct puffs_cn *pcn_src,
+ puffs_cookie_t targ_dir, puffs_cookie_t targ,
const struct puffs_cn *pcn_targ)
{
@@ -376,7 +377,7 @@ puffs_null_node_rename(struct puffs_usermount *pu, void *opc, void *src,
/*ARGSUSED*/
int
-puffs_null_node_mkdir(struct puffs_usermount *pu, void *opc,
+puffs_null_node_mkdir(struct puffs_usermount *pu, puffs_cookie_t opc,
struct puffs_newinfo *pni, const struct puffs_cn *pcn,
const struct vattr *va)
{
@@ -393,8 +394,8 @@ puffs_null_node_mkdir(struct puffs_usermount *pu, void *opc,
/*ARGSUSED*/
int
-puffs_null_node_rmdir(struct puffs_usermount *pu, void *opc, void *targ,
- const struct puffs_cn *pcn)
+puffs_null_node_rmdir(struct puffs_usermount *pu, puffs_cookie_t opc,
+ puffs_cookie_t targ, const struct puffs_cn *pcn)
{
struct puffs_node *pn_targ = targ;
@@ -407,7 +408,7 @@ puffs_null_node_rmdir(struct puffs_usermount *pu, void *opc, void *targ,
/*ARGSUSED*/
int
-puffs_null_node_symlink(struct puffs_usermount *pu, void *opc,
+puffs_null_node_symlink(struct puffs_usermount *pu, puffs_cookie_t opc,
struct puffs_newinfo *pni, const struct puffs_cn *pcn,
const struct vattr *va, const char *linkname)
{
@@ -424,7 +425,7 @@ puffs_null_node_symlink(struct puffs_usermount *pu, void *opc,
/*ARGSUSED*/
int
-puffs_null_node_readlink(struct puffs_usermount *pu, void *opc,
+puffs_null_node_readlink(struct puffs_usermount *pu, puffs_cookie_t opc,
const struct puffs_cred *pcred, char *linkname, size_t *linklen)
{
struct puffs_node *pn = opc;
@@ -440,7 +441,7 @@ puffs_null_node_readlink(struct puffs_usermount *pu, void *opc,
/*ARGSUSED*/
int
-puffs_null_node_readdir(struct puffs_usermount *pu, void *opc,
+puffs_null_node_readdir(struct puffs_usermount *pu, puffs_cookie_t opc,
struct dirent *de, off_t *off, size_t *reslen,
const struct puffs_cred *pcred, int *eofflag, off_t *cookies,
size_t *ncookies)
@@ -493,9 +494,9 @@ puffs_null_node_readdir(struct puffs_usermount *pu, void *opc,
/*ARGSUSED*/
int
-puffs_null_node_read(struct puffs_usermount *pu, void *opc, uint8_t *buf,
- off_t offset, size_t *buflen, const struct puffs_cred *pcred,
- int ioflag)
+puffs_null_node_read(struct puffs_usermount *pu, puffs_cookie_t opc,
+ uint8_t *buf, off_t offset, size_t *buflen,
+ const struct puffs_cred *pcred, int ioflag)
{
struct puffs_node *pn = opc;
ssize_t n;
@@ -525,9 +526,9 @@ puffs_null_node_read(struct puffs_usermount *pu, void *opc, uint8_t *buf,
/*ARGSUSED*/
int
-puffs_null_node_write(struct puffs_usermount *pu, void *opc, uint8_t *buf,
- off_t offset, size_t *buflen, const struct puffs_cred *pcred,
- int ioflag)
+puffs_null_node_write(struct puffs_usermount *pu, puffs_cookie_t opc,
+ uint8_t *buf, off_t offset, size_t *buflen,
+ const struct puffs_cred *pcred, int ioflag)
{
struct puffs_node *pn = opc;
ssize_t n;
diff --git a/lib/libpuffs/opdump.c b/lib/libpuffs/opdump.c
index b5c0d37e824..7b3c4291221 100644
--- a/lib/libpuffs/opdump.c
+++ b/lib/libpuffs/opdump.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opdump.c,v 1.23 2008/01/27 00:29:24 pooka Exp $ */
+/* $NetBSD: opdump.c,v 1.24 2008/08/12 19:44:39 pooka Exp $ */
/*
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: opdump.c,v 1.23 2008/01/27 00:29:24 pooka Exp $");
+__RCSID("$NetBSD: opdump.c,v 1.24 2008/08/12 19:44:39 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -233,7 +233,7 @@ puffsdump_rv(struct puffs_req *preq)
}
void
-puffsdump_cookie(void *c, const char *cookiename)
+puffsdump_cookie(puffs_cookie_t c, const char *cookiename)
{
printf("\t%scookie: at %p\n", cookiename, c);
diff --git a/lib/libpuffs/paths.c b/lib/libpuffs/paths.c
index 50c12fb0a8c..50f4cbb63ee 100644
--- a/lib/libpuffs/paths.c
+++ b/lib/libpuffs/paths.c
@@ -1,4 +1,4 @@
-/* $NetBSD: paths.c,v 1.7 2007/06/06 01:55:01 pooka Exp $ */
+/* $NetBSD: paths.c,v 1.8 2008/08/12 19:44:39 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: paths.c,v 1.7 2007/06/06 01:55:01 pooka Exp $");
+__RCSID("$NetBSD: paths.c,v 1.8 2008/08/12 19:44:39 pooka Exp $");
#endif /* !lint */
#include <sys/hash.h>
@@ -45,7 +45,7 @@ __RCSID("$NetBSD: paths.c,v 1.7 2007/06/06 01:55:01 pooka Exp $");
int
puffs_path_pcnbuild(struct puffs_usermount *pu, struct puffs_cn *pcn,
- void *parent)
+ puffs_cookie_t parent)
{
struct puffs_node *pn_parent = PU_CMAP(pu, parent);
struct puffs_cn pcn_orig;
diff --git a/lib/libpuffs/pnode.c b/lib/libpuffs/pnode.c
index 6441630ff5d..bf757c1c3cf 100644
--- a/lib/libpuffs/pnode.c
+++ b/lib/libpuffs/pnode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pnode.c,v 1.9 2007/08/17 17:25:31 pooka Exp $ */
+/* $NetBSD: pnode.c,v 1.10 2008/08/12 19:44:39 pooka Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: pnode.c,v 1.9 2007/08/17 17:25:31 pooka Exp $");
+__RCSID("$NetBSD: pnode.c,v 1.10 2008/08/12 19:44:39 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -148,7 +148,7 @@ puffs_pn_getmntspecific(struct puffs_node *pn)
* newnode parameters
*/
void
-puffs_newinfo_setcookie(struct puffs_newinfo *pni, void *cookie)
+puffs_newinfo_setcookie(struct puffs_newinfo *pni, puffs_cookie_t cookie)
{
*pni->pni_cookie = cookie;
diff --git a/lib/libpuffs/puffs.3 b/lib/libpuffs/puffs.3
index 6b16b6134ec..4b2c3b0260f 100644
--- a/lib/libpuffs/puffs.3
+++ b/lib/libpuffs/puffs.3
@@ -1,4 +1,4 @@
-.\" $NetBSD: puffs.3,v 1.40 2008/05/25 19:38:14 wiz Exp $
+.\" $NetBSD: puffs.3,v 1.41 2008/08/12 19:44:39 pooka Exp $
.\"
.\" Copyright (c) 2006, 2007, 2008 Antti Kantee. All rights reserved.
.\"
@@ -41,7 +41,7 @@
.Ft int
.Fo puffs_mount
.Fa "struct puffs_usermount *pu" "const char *dir" "int mntflags"
-.Fa "void *root_cookie"
+.Fa "puffs_cookie_t root_cookie"
.Fc
.Ft int
.Fn puffs_getselectable "struct puffs_usermount *pu"
diff --git a/lib/libpuffs/puffs.c b/lib/libpuffs/puffs.c
index 7edc377d74f..51f2f1730ca 100644
--- a/lib/libpuffs/puffs.c
+++ b/lib/libpuffs/puffs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.c,v 1.91 2008/08/11 16:23:37 pooka Exp $ */
+/* $NetBSD: puffs.c,v 1.92 2008/08/12 19:44:39 pooka Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: puffs.c,v 1.91 2008/08/11 16:23:37 pooka Exp $");
+__RCSID("$NetBSD: puffs.c,v 1.92 2008/08/12 19:44:39 pooka Exp $");
#endif /* !lint */
#include <sys/param.h>
@@ -122,7 +122,7 @@ finalpush(struct puffs_usermount *pu)
/*ARGSUSED*/
static void
puffs_defaulterror(struct puffs_usermount *pu, uint8_t type,
- int error, const char *str, void *cookie)
+ int error, const char *str, puffs_cookie_t cookie)
{
fprintf(stderr, "abort: type %d, error %d, cookie %p (%s)\n",
@@ -458,7 +458,7 @@ puffs_daemon(struct puffs_usermount *pu, int nochdir, int noclose)
int
puffs_mount(struct puffs_usermount *pu, const char *dir, int mntflags,
- void *cookie)
+ puffs_cookie_t cookie)
{
char rp[MAXPATHLEN];
ssize_t n;
diff --git a/lib/libpuffs/puffs.h b/lib/libpuffs/puffs.h
index 69791e4b897..4f2fe067c13 100644
--- a/lib/libpuffs/puffs.h
+++ b/lib/libpuffs/puffs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.h,v 1.107 2008/01/29 10:07:29 pooka Exp $ */
+/* $NetBSD: puffs.h,v 1.108 2008/08/12 19:44:39 pooka Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -157,71 +157,71 @@ struct puffs_ops {
const struct puffs_cred *);
int (*puffs_fs_fhtonode)(struct puffs_usermount *, void *, size_t,
struct puffs_newinfo *);
- int (*puffs_fs_nodetofh)(struct puffs_usermount *, void *cookie,
+ int (*puffs_fs_nodetofh)(struct puffs_usermount *, puffs_cookie_t,
void *, size_t *);
void (*puffs_fs_suspend)(struct puffs_usermount *, int);
int (*puffs_node_lookup)(struct puffs_usermount *,
- void *, struct puffs_newinfo *, const struct puffs_cn *);
+ puffs_cookie_t, struct puffs_newinfo *, const struct puffs_cn *);
int (*puffs_node_create)(struct puffs_usermount *,
- void *, struct puffs_newinfo *, const struct puffs_cn *,
+ puffs_cookie_t, struct puffs_newinfo *, const struct puffs_cn *,
const struct vattr *);
int (*puffs_node_mknod)(struct puffs_usermount *,
- void *, struct puffs_newinfo *, const struct puffs_cn *,
+ puffs_cookie_t, struct puffs_newinfo *, const struct puffs_cn *,
const struct vattr *);
int (*puffs_node_open)(struct puffs_usermount *,
- void *, int, const struct puffs_cred *);
+ puffs_cookie_t, int, const struct puffs_cred *);
int (*puffs_node_close)(struct puffs_usermount *,
- void *, int, const struct puffs_cred *);
+ puffs_cookie_t, int, const struct puffs_cred *);
int (*puffs_node_access)(struct puffs_usermount *,
- void *, int, const struct puffs_cred *);
+ puffs_cookie_t, int, const struct puffs_cred *);
int (*puffs_node_getattr)(struct puffs_usermount *,
- void *, struct vattr *, const struct puffs_cred *);
+ puffs_cookie_t, struct vattr *, const struct puffs_cred *);
int (*puffs_node_setattr)(struct puffs_usermount *,
- void *, const struct vattr *, const struct puffs_cred *);
- int (*puffs_node_poll)(struct puffs_usermount *, void *, int *);
+ puffs_cookie_t, const struct vattr *, const struct puffs_cred *);
+ int (*puffs_node_poll)(struct puffs_usermount *, puffs_cookie_t, int *);
int (*puffs_node_mmap)(struct puffs_usermount *,
- void *, vm_prot_t, const struct puffs_cred *);
+ puffs_cookie_t, vm_prot_t, const struct puffs_cred *);
int (*puffs_node_fsync)(struct puffs_usermount *,
- void *, const struct puffs_cred *, int, off_t, off_t);
+ puffs_cookie_t, const struct puffs_cred *, int, off_t, off_t);
int (*puffs_node_seek)(struct puffs_usermount *,
- void *, off_t, off_t, const struct puffs_cred *);
+ puffs_cookie_t, off_t, off_t, const struct puffs_cred *);
int (*puffs_node_remove)(struct puffs_usermount *,
- void *, void *, const struct puffs_cn *);
+ puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *);
int (*puffs_node_link)(struct puffs_usermount *,
- void *, void *, const struct puffs_cn *);
+ puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *);
int (*puffs_node_rename)(struct puffs_usermount *,
- void *, void *, const struct puffs_cn *, void *, void *,
- const struct puffs_cn *);
+ puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *,
+ puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *);
int (*puffs_node_mkdir)(struct puffs_usermount *,
- void *, struct puffs_newinfo *, const struct puffs_cn *,
+ puffs_cookie_t, struct puffs_newinfo *, const struct puffs_cn *,
const struct vattr *);
int (*puffs_node_rmdir)(struct puffs_usermount *,
- void *, void *, const struct puffs_cn *);
+ puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *);
int (*puffs_node_symlink)(struct puffs_usermount *,
- void *, struct puffs_newinfo *, const struct puffs_cn *,
+ puffs_cookie_t, struct puffs_newinfo *, const struct puffs_cn *,
const struct vattr *,
const char *);
int (*puffs_node_readdir)(struct puffs_usermount *,
- void *, struct dirent *, off_t *, size_t *,
+ puffs_cookie_t, struct dirent *, off_t *, size_t *,
const struct puffs_cred *, int *, off_t *, size_t *);
int (*puffs_node_readlink)(struct puffs_usermount *,
- void *, const struct puffs_cred *, char *, size_t *);
- int (*puffs_node_reclaim)(struct puffs_usermount *, void *);
- int (*puffs_node_inactive)(struct puffs_usermount *, void *);
- int (*puffs_node_print)(struct puffs_usermount *, void *);
+ puffs_cookie_t, const struct puffs_cred *, char *, size_t *);
+ int (*puffs_node_reclaim)(struct puffs_usermount *, puffs_cookie_t);
+ int (*puffs_node_inactive)(struct puffs_usermount *, puffs_cookie_t);
+ int (*puffs_node_print)(struct puffs_usermount *, puffs_cookie_t);
int (*puffs_node_pathconf)(struct puffs_usermount *,
- void *, int, int *);
+ puffs_cookie_t, int, int *);
int (*puffs_node_advlock)(struct puffs_usermount *,
- void *, void *, int, struct flock *, int);
- int (*puffs_node_read)(struct puffs_usermount *, void *,
+ puffs_cookie_t, void *, int, struct flock *, int);
+ int (*puffs_node_read)(struct puffs_usermount *, puffs_cookie_t,
uint8_t *, off_t, size_t *, const struct puffs_cred *, int);
- int (*puffs_node_write)(struct puffs_usermount *, void *,
+ int (*puffs_node_write)(struct puffs_usermount *, puffs_cookie_t,
uint8_t *, off_t, size_t *, const struct puffs_cred *, int);
/* XXX: this shouldn't be here */
void (*puffs_cache_write)(struct puffs_usermount *,
- void *, size_t, struct puffs_cacherun *);
+ puffs_cookie_t, size_t, struct puffs_cacherun *);
};
typedef int (*pu_pathbuild_fn)(struct puffs_usermount *,
@@ -240,11 +240,12 @@ typedef int (*pu_namemod_fn)(struct puffs_usermount *,
struct puffs_pathobj *, struct puffs_cn *);
typedef void (*pu_errnotify_fn)(struct puffs_usermount *,
- uint8_t, int, const char *, void *);
+ uint8_t, int, const char *, puffs_cookie_t);
typedef void (*pu_prepost_fn)(struct puffs_usermount *);
-typedef struct puffs_node *(*pu_cmap_fn)(struct puffs_usermount *, void *);
+typedef struct puffs_node *(*pu_cmap_fn)(struct puffs_usermount *,
+ puffs_cookie_t);
enum {
PUFFS_STATE_BEFOREMOUNT, PUFFS_STATE_RUNNING,
@@ -283,70 +284,78 @@ enum {
const struct puffs_cred *cred); \
int fsname##_fs_fhtonode(struct puffs_usermount *, void *, \
size_t, struct puffs_newinfo *); \
- int fsname##_fs_nodetofh(struct puffs_usermount *, void *cookie,\
- void *, size_t *); \
+ int fsname##_fs_nodetofh(struct puffs_usermount *, \
+ puffs_cookie_t, void *, size_t *); \
void fsname##_fs_suspend(struct puffs_usermount *, int); \
\
int fsname##_node_lookup(struct puffs_usermount *, \
- void *, struct puffs_newinfo *, const struct puffs_cn *); \
+ puffs_cookie_t, struct puffs_newinfo *, \
+ const struct puffs_cn *); \
int fsname##_node_create(struct puffs_usermount *, \
- void *, struct puffs_newinfo *, const struct puffs_cn *, \
- const struct vattr *); \
+ puffs_cookie_t, struct puffs_newinfo *, \
+ const struct puffs_cn *, const struct vattr *); \
int fsname##_node_mknod(struct puffs_usermount *, \
- void *, struct puffs_newinfo *, const struct puffs_cn *, \
- const struct vattr *); \
+ puffs_cookie_t, struct puffs_newinfo *, \
+ const struct puffs_cn *, const struct vattr *); \
int fsname##_node_open(struct puffs_usermount *, \
- void *, int, const struct puffs_cred *); \
+ puffs_cookie_t, int, const struct puffs_cred *); \
int fsname##_node_close(struct puffs_usermount *, \
- void *, int, const struct puffs_cred *); \
+ puffs_cookie_t, int, const struct puffs_cred *); \
int fsname##_node_access(struct puffs_usermount *, \
- void *, int, const struct puffs_cred *); \
+ puffs_cookie_t, int, const struct puffs_cred *); \
int fsname##_node_getattr(struct puffs_usermount *, \
- void *, struct vattr *, const struct puffs_cred *); \
+ puffs_cookie_t, struct vattr *, const struct puffs_cred *); \
int fsname##_node_setattr(struct puffs_usermount *, \
- void *, const struct vattr *, const struct puffs_cred *); \
- int fsname##_node_poll(struct puffs_usermount *, void *, int *);\
+ puffs_cookie_t, const struct vattr *, \
+ const struct puffs_cred *); \
+ int fsname##_node_poll(struct puffs_usermount *, \
+ puffs_cookie_t, int *); \
int fsname##_node_mmap(struct puffs_usermount *, \
- void *, vm_prot_t, const struct puffs_cred *); \
+ puffs_cookie_t, vm_prot_t, const struct puffs_cred *); \
int fsname##_node_fsync(struct puffs_usermount *, \
- void *, const struct puffs_cred *, int, off_t, off_t); \
+ puffs_cookie_t, const struct puffs_cred *, int, \
+ off_t, off_t); \
int fsname##_node_seek(struct puffs_usermount *, \
- void *, off_t, off_t, const struct puffs_cred *); \
+ puffs_cookie_t, off_t, off_t, const struct puffs_cred *); \
int fsname##_node_remove(struct puffs_usermount *, \
- void *, void *, const struct puffs_cn *); \
+ puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *); \
int fsname##_node_link(struct puffs_usermount *, \
- void *, void *, const struct puffs_cn *); \
+ puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *); \
int fsname##_node_rename(struct puffs_usermount *, \
- void *, void *, const struct puffs_cn *, void *, void *, \
- const struct puffs_cn *); \
+ puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *, \
+ puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *); \
int fsname##_node_mkdir(struct puffs_usermount *, \
- void *, struct puffs_newinfo *, const struct puffs_cn *, \
- const struct vattr *); \
+ puffs_cookie_t, struct puffs_newinfo *, \
+ const struct puffs_cn *, const struct vattr *); \
int fsname##_node_rmdir(struct puffs_usermount *, \
- void *, void *, const struct puffs_cn *); \
+ puffs_cookie_t, puffs_cookie_t, const struct puffs_cn *); \
int fsname##_node_symlink(struct puffs_usermount *, \
- void *, struct puffs_newinfo *, const struct puffs_cn *, \
- const struct vattr *, const char *); \
+ puffs_cookie_t, struct puffs_newinfo *, \
+ const struct puffs_cn *, const struct vattr *, \
+ const char *); \
int fsname##_node_readdir(struct puffs_usermount *, \
- void *, struct dirent *, off_t *, size_t *, \
+ puffs_cookie_t, struct dirent *, off_t *, size_t *, \
const struct puffs_cred *, int *, off_t *, size_t *); \
int fsname##_node_readlink(struct puffs_usermount *, \
- void *, const struct puffs_cred *, char *, size_t *); \
- int fsname##_node_reclaim(struct puffs_usermount *, void *); \
- int fsname##_node_inactive(struct puffs_usermount *, void *); \
+ puffs_cookie_t, const struct puffs_cred *, char *, \
+ size_t *); \
+ int fsname##_node_reclaim(struct puffs_usermount *, \
+ puffs_cookie_t); \
+ int fsname##_node_inactive(struct puffs_usermount *, \
+ puffs_cookie_t); \
int fsname##_node_print(struct puffs_usermount *, \
- void *); \
+ puffs_cookie_t); \
int fsname##_node_pathconf(struct puffs_usermount *, \
- void *, int, int *); \
+ puffs_cookie_t, int, int *); \
int fsname##_node_advlock(struct puffs_usermount *, \
- void *, void *, int, struct flock *, int); \
- int fsname##_node_read(struct puffs_usermount *, void *, \
+ puffs_cookie_t, void *, int, struct flock *, int); \
+ int fsname##_node_read(struct puffs_usermount *, puffs_cookie_t,\
uint8_t *, off_t, size_t *, const struct puffs_cred *, int);\
- int fsname##_node_write(struct puffs_usermount *, void *, \
- uint8_t *, off_t, size_t *, const struct puffs_cred *, int);\
- \
- int fsname##_cache_write(struct puffs_usermount *, void *, \
- size_t, struct puffs_cacheinfo *);
+ int fsname##_node_write(struct puffs_usermount *, \
+ puffs_cookie_t, uint8_t *, off_t, size_t *, \
+ const struct puffs_cred *, int); \
+ int fsname##_cache_write(struct puffs_usermount *, \
+ puffs_cookie_t, size_t, struct puffs_cacheinfo *);
#define PUFFSOP_INIT(ops) \
ops = malloc(sizeof(struct puffs_ops)); \
@@ -448,7 +457,7 @@ void puffs_pn_setpriv(struct puffs_node *, void *);
struct puffs_pathobj *puffs_pn_getpo(struct puffs_node *);
struct puffs_usermount *puffs_pn_getmnt(struct puffs_node *);
-void puffs_newinfo_setcookie(struct puffs_newinfo *, void *);
+void puffs_newinfo_setcookie(struct puffs_newinfo *, puffs_cookie_t);
void puffs_newinfo_setvtype(struct puffs_newinfo *, enum vtype);
void puffs_newinfo_setsize(struct puffs_newinfo *, voff_t);
void puffs_newinfo_setrdev(struct puffs_newinfo *, dev_t);
@@ -480,9 +489,9 @@ void puffs_zerostatvfs(struct statvfs *);
int puffs_fsnop_sync(struct puffs_usermount *, int waitfor,
const struct puffs_cred *);
-int puffs_genfs_node_getattr(struct puffs_usermount *, void *,
+int puffs_genfs_node_getattr(struct puffs_usermount *, puffs_cookie_t,
struct vattr *, const struct puffs_cred *);
-int puffs_genfs_node_reclaim(struct puffs_usermount *, void *);
+int puffs_genfs_node_reclaim(struct puffs_usermount *, puffs_cookie_t);
/*
* Subroutine stuff
@@ -539,15 +548,15 @@ struct puffs_cc *puffs_cc_getcc(struct puffs_usermount *);
* Flushing / invalidation routines
*/
-int puffs_inval_namecache_dir(struct puffs_usermount *, void *);
+int puffs_inval_namecache_dir(struct puffs_usermount *, puffs_cookie_t);
int puffs_inval_namecache_all(struct puffs_usermount *);
-int puffs_inval_pagecache_node(struct puffs_usermount *, void *);
-int puffs_inval_pagecache_node_range(struct puffs_usermount *, void *,
- off_t, off_t);
-int puffs_flush_pagecache_node(struct puffs_usermount *, void *);
-int puffs_flush_pagecache_node_range(struct puffs_usermount *, void *,
- off_t, off_t);
+int puffs_inval_pagecache_node(struct puffs_usermount *, puffs_cookie_t);
+int puffs_inval_pagecache_node_range(struct puffs_usermount *,
+ puffs_cookie_t, off_t, off_t);
+int puffs_flush_pagecache_node(struct puffs_usermount *, puffs_cookie_t);
+int puffs_flush_pagecache_node_range(struct puffs_usermount *,
+ puffs_cookie_t, off_t, off_t);
/*
* Path constructicons
diff --git a/lib/libpuffs/puffs_flush.3 b/lib/libpuffs/puffs_flush.3
index b9f2c010580..5e9c619d415 100644
--- a/lib/libpuffs/puffs_flush.3
+++ b/lib/libpuffs/puffs_flush.3
@@ -1,4 +1,4 @@
-.\" $NetBSD: puffs_flush.3,v 1.6 2007/12/01 19:54:01 wiz Exp $
+.\" $NetBSD: puffs_flush.3,v 1.7 2008/08/12 19:44:39 pooka Exp $
.\"
.\" Copyright (c) 2007 Antti Kantee. All rights reserved.
.\"
@@ -34,20 +34,28 @@
.Sh SYNOPSIS
.In puffs.h
.Ft int
-.Fn puffs_inval_namecache_dir "struct puffs_usermount *pu" "void *cookie"
+.Fo puffs_inval_namecache_dir
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t cookie"
+.Fc
.Ft int
.Fn puffs_inval_namecache_all "struct puffs_usermount *pu"
.Ft int
-.Fn puffs_inval_pagecache_node "struct puffs_usermount *pu" "void *cookie"
+.Fo puffs_inval_pagecache_node
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t cookie"
+.Fc
.Ft int
.Fo puffs_inval_pagecache_node_range
-.Fa "struct puffs_usermount *pu" "void *cookie" "off_t start" "off_t end"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t cookie" "off_t start"
+.Fa "off_t end"
.Fc
.Ft int
-.Fn puffs_flush_pagecache_node "struct puffs_usermount *pu" "void *cookie"
+.Fo puffs_flush_pagecache_node
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t cookie"
+.Fc
.Ft int
.Fo puffs_flush_pagecache_node_range
-.Fa "struct puffs_usermount *pu" "void *cookie" "off_t start" "off_t end"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t cookie" "off_t start"
+.Fa "off_t end"
.Fc
.Sh DESCRIPTION
.Em IMPORTANT NOTE!
diff --git a/lib/libpuffs/puffs_ops.3 b/lib/libpuffs/puffs_ops.3
index 66003ce94f0..8eaa4e1c8ef 100644
--- a/lib/libpuffs/puffs_ops.3
+++ b/lib/libpuffs/puffs_ops.3
@@ -1,4 +1,4 @@
-.\" $NetBSD: puffs_ops.3,v 1.20 2007/12/16 19:10:58 pooka Exp $
+.\" $NetBSD: puffs_ops.3,v 1.21 2008/08/12 19:44:39 pooka Exp $
.\"
.\" Copyright (c) 2007 Antti Kantee. All rights reserved.
.\"
@@ -48,7 +48,8 @@
.Fc
.Ft int
.Fo puffs_fs_nodetofh
-.Fa "struct puffs_usermount *pu" "void *cookie" "void *fid" "size_t *fidsize"
+.Fa "struct puffs_usermount *pu" "puffs_cooie_t cookie" "void *fid"
+.Fa "size_t *fidsize"
.Fc
.Ft void
.Fn puffs_fs_suspend "struct puffs_usermount *pu" "int status"
@@ -58,130 +59,134 @@
.Fc
.Ft int
.Fo puffs_node_lookup
-.Fa "struct puffs_usermount *pu" "void *opc" "struct puffs_newinfo *pni"
-.Fa "const struct puffs_cn *pcn"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc"
+.Fa "struct puffs_newinfo *pni" "const struct puffs_cn *pcn"
.Fc
.Ft int
.Fo puffs_node_create
-.Fa "struct puffs_usermount *pu" "void *opc" "struct puffs_newinfo *pni"
-.Fa "const struct puffs_cn *pcn" "const struct vattr *vap"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc"
+.Fa "struct puffs_newinfo *pni" "const struct puffs_cn *pcn"
+.Fa "const struct vattr *vap"
.Fc
.Ft int
.Fo puffs_node_mknod
-.Fa "struct puffs_usermount *pu" "void *opc" "struct puffs_newinfo *pni"
-.Fa "const struct puffs_cn *pcn" "const struct vattr *vap"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc"
+.Fa "struct puffs_newinfo *pni" "const struct puffs_cn *pcn"
+.Fa "const struct vattr *vap"
.Fc
.Ft int
.Fo puffs_node_open
-.Fa "struct puffs_usermount *pu" "void *opc" "int mode"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "int mode"
.Fa "const struct puffs_cred *pcr"
.Fc
.Ft int
.Fo puffs_node_close
-.Fa "struct puffs_usermount *pu" "void *opc" "int flags"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "int flags"
.Fa "const struct puffs_cred *pcr"
.Fc
.Ft int
.Fo puffs_node_access
-.Fa "struct puffs_usermount *pu" "void *opc" "int mode"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "int mode"
.Fa "const struct puffs_cred *pcr"
.Fc
.Ft int
.Fo puffs_node_getattr
-.Fa "struct puffs_usermount *pu" "void *opc" "struct vattr *vap"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "struct vattr *vap"
.Fa "const struct puffs_cred *pcr"
.Fc
.Ft int
.Fo puffs_node_setattr
-.Fa "struct puffs_usermount *pu" "void *opc" "const struct vattr *vap"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "const struct vattr *vap"
.Fa "const struct puffs_cred *pcr"
.Fc
.Ft int
.Fo puffs_node_poll
-.Fa "struct puffs_usermount *pu" "void *opc" "int *events"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "int *events"
.Fc
.Ft int
.Fo puffs_node_mmap
-.Fa "struct puffs_usermount *pu" "void *opc" "int flags"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "int flags"
.Fa "const struct puffs_cred *pcr"
.Fc
.Ft int
.Fo puffs_node_fsync
-.Fa "struct puffs_usermount *pu" "void *opc" "const struct puffs_cred *pcr"
-.Fa "int flags" "off_t offlo" "off_t offhi"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc"
+.Fa "const struct puffs_cred *pcr" "int flags" "off_t offlo" "off_t offhi"
.Fc
.Ft int
.Fo puffs_node_seek
-.Fa "struct puffs_usermount *pu" "void *opc" "off_t oldoff" "off_t newoff"
-.Fa "const struct puffs_cred *pcr"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "off_t oldoff"
+.Fa "off_t newoff" "const struct puffs_cred *pcr"
.Fc
.Ft int
.Fo puffs_node_remove
-.Fa "struct puffs_usermount *pu" "void *opc" "void *targ"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "puffs_cookie_t targ"
.Fa "const struct puffs_cn *pcn"
.Fc
.Ft int
.Fo puffs_node_link
-.Fa "struct puffs_usermount *pu" "void *opc" "void *targ"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "puffs_cookie_t targ"
.Fa "const struct puffs_cn *pcn"
.Fc
.Ft int
.Fo puffs_node_rename
-.Fa "struct puffs_usermount *pu" "void *opc" "void *src"
-.Fa "const struct puffs_cn *pcn_src" "void *targ_dir" "void *targ"
-.Fa "const struct puffs_cn *pcn_targ"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "puffs_cookie_t src"
+.Fa "const struct puffs_cn *pcn_src" "puffs_cookie_t targ_dir"
+.Fa "puffs_cookie_t targ" "const struct puffs_cn *pcn_targ"
.Fc
.Ft int
.Fo puffs_node_mkdir
-.Fa "struct puffs_usermount *pu" "void *opc" "struct puffs_newinfo *pni"
-.Fa "const struct puffs_cn *pcn" "const struct vattr *vap"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc"
+.Fa "struct puffs_newinfo *pni" "const struct puffs_cn *pcn"
+.Fa "const struct vattr *vap"
.Fc
.Ft int
.Fo puffs_node_rmdir
-.Fa "struct puffs_usermount *pu" "void *opc" "void *targ"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "puffs_cookie_t targ"
.Fa "const struct puffs_cn *pcn"
.Fc
.Ft int
.Fo puffs_node_readdir
-.Fa "struct puffs_usermount *pu" "void *opc" "struct dirent *dent"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "struct dirent *dent"
.Fa "off_t *readoff" "size_t *reslen" "const struct puffs_cred *pcr"
.Fa "int *eofflag" "off_t *cookies" "size_t *ncookies"
.Fc
.Ft int
.Fo puffs_node_symlink
-.Fa "struct puffs_usermount *pu" "void *opc" "struct puffs_newinfo *pni"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc"
+.Fa "struct puffs_newinfo *pni"
.Fa "const struct puffs_cn *pcn_src" "const struct vattr *vap"
.Fa "const char *link_target"
.Fc
.Ft int
.Fo puffs_node_readlink
-.Fa "struct puffs_usermount *pu" "void *opc" "const struct puffs_cred *pcr"
-.Fa "char *link" "size_t *linklen"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc"
+.Fa "const struct puffs_cred *pcr" "char *link" "size_t *linklen"
.Fc
.Ft int
.Fo puffs_node_read
-.Fa "struct puffs_usermount *pu" "void *opc" "uint8_t *buf"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "uint8_t *buf"
.Fa "off_t offset" "size_t *resid" "const struct puffs_cred *pcr" "int ioflag"
.Fc
.Ft int
.Fo puffs_node_write
-.Fa "struct puffs_usermount *pu" "void *opc" "uint8_t *buf"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc" "uint8_t *buf"
.Fa "off_t offset" "size_t *resid" "const struct puffs_cred *pcr" "int ioflag"
.Fc
.Ft int
-.Fn puffs_node_print "struct puffs_usermount *pu" "void *opc"
+.Fn puffs_node_print "struct puffs_usermount *pu" "puffs_cookie_t opc"
.Ft int
.Fo puffs_node_reclaim
-.Fa "struct puffs_usermount *pu" "void *opc"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc"
.Fc
.Ft int
.Fo puffs_node_inactive
-.Fa "struct puffs_usermount *pu" "void *opc"
+.Fa "struct puffs_usermount *pu" "puffs_cookie_t opc"
.Fc
.Ft void
.Fn puffs_setback "struct puffs_cc *pcc" "int op"
.Ft void
-.Fn puffs_newinfo_setcookie "struct puffs_newinfo *pni" "void *cookie"
+.Fn puffs_newinfo_setcookie "struct puffs_newinfo *pni" "puffs_cookie_t cookie"
.Ft void
.Fn puffs_newinfo_setvtype "struct puffs_newinfo *pni" "enum vtype vtype"
.Ft void
diff --git a/lib/libpuffs/puffsdump.h b/lib/libpuffs/puffsdump.h
index 44c94cbdd59..fe1e87173b8 100644
--- a/lib/libpuffs/puffsdump.h
+++ b/lib/libpuffs/puffsdump.h
@@ -1,4 +1,4 @@
-/* $NetBSD: puffsdump.h,v 1.9 2008/01/27 00:29:24 pooka Exp $ */
+/* $NetBSD: puffsdump.h,v 1.10 2008/08/12 19:44:39 pooka Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@@ -34,7 +34,7 @@
void puffsdump_req(struct puffs_req *);
void puffsdump_rv(struct puffs_req *);
-void puffsdump_cookie(void *, const char *);
+void puffsdump_cookie(puffs_cookie_t, const char *);
void puffsdump_cn(struct puffs_kcn *);
void puffsdump_creds(struct puffs_cred *);
void puffsdump_int(int, const char *);
diff --git a/lib/libpuffs/subr.c b/lib/libpuffs/subr.c
index 19a6c5f5b6f..9a5eea5b363 100644
--- a/lib/libpuffs/subr.c
+++ b/lib/libpuffs/subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: subr.c,v 1.22 2007/12/19 14:01:16 pooka Exp $ */
+/* $NetBSD: subr.c,v 1.23 2008/08/12 19:44:39 pooka Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: subr.c,v 1.22 2007/12/19 14:01:16 pooka Exp $");
+__RCSID("$NetBSD: subr.c,v 1.23 2008/08/12 19:44:39 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -112,7 +112,7 @@ puffs_fsnop_statvfs(struct puffs_usermount *dontuse1, struct statvfs *sbp)
/*ARGSUSED3*/
int
-puffs_genfs_node_getattr(struct puffs_usermount *pu, void *opc,
+puffs_genfs_node_getattr(struct puffs_usermount *pu, puffs_cookie_t opc,
struct vattr *va, const struct puffs_cred *pcr)
{
struct puffs_node *pn = PU_CMAP(pu, opc);
@@ -127,7 +127,7 @@ puffs_genfs_node_getattr(struct puffs_usermount *pu, void *opc,
*/
/*ARGSUSED2*/
int
-puffs_genfs_node_reclaim(struct puffs_usermount *pu, void *opc)
+puffs_genfs_node_reclaim(struct puffs_usermount *pu, puffs_cookie_t opc)
{
puffs_pn_put(PU_CMAP(pu, opc));