adapt: pid -> const struct puffs_cid *
This commit is contained in:
pooka
parent
ffe0a01441
commit
fe7bbdec69
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: refuse.c,v 1.69 2007/07/01 15:32:02 pooka Exp $ */
|
||||
/* $NetBSD: refuse.c,v 1.70 2007/07/01 17:23:45 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright © 2007 Alistair Crooks. All rights reserved.
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#if !defined(lint)
|
||||
__RCSID("$NetBSD: refuse.c,v 1.69 2007/07/01 15:32:02 pooka Exp $");
|
||||
__RCSID("$NetBSD: refuse.c,v 1.70 2007/07/01 17:23:45 pooka Exp $");
|
||||
#endif /* !lint */
|
||||
|
||||
#include <assert.h>
|
||||
|
|
@ -240,12 +240,12 @@ set_fuse_context_uid_gid(const struct puffs_cred *cred)
|
|||
|
||||
/* set the pid of the calling process in the current fuse context */
|
||||
static void
|
||||
set_fuse_context_pid(pid_t pid)
|
||||
set_fuse_context_pid(const struct puffs_cid *pcid)
|
||||
{
|
||||
struct fuse_context *fusectx;
|
||||
|
||||
fusectx = fuse_get_context();
|
||||
fusectx->pid = pid;
|
||||
puffs_cid_getpid(pcid, &fusectx->pid);
|
||||
}
|
||||
|
||||
/***************** end of pthread context routines ************************/
|
||||
|
|
@ -597,7 +597,7 @@ puffs_fuse_node_lookup(struct puffs_cc *pcc, void *opc, void **newnode,
|
|||
/* ARGSUSED3 */
|
||||
static int
|
||||
puffs_fuse_node_getattr(struct puffs_cc *pcc, void *opc, struct vattr *va,
|
||||
const struct puffs_cred *pcr, pid_t pid)
|
||||
const struct puffs_cred *pcr, const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_usermount *pu = puffs_cc_getusermount(pcc);
|
||||
struct puffs_node *pn = opc;
|
||||
|
|
@ -607,7 +607,7 @@ puffs_fuse_node_getattr(struct puffs_cc *pcc, void *opc, struct vattr *va,
|
|||
fuse = puffs_getspecific(pu);
|
||||
|
||||
set_fuse_context_uid_gid(pcr);
|
||||
set_fuse_context_pid(pid);
|
||||
set_fuse_context_pid(pcid);
|
||||
|
||||
return fuse_getattr(fuse, pn, path, va);
|
||||
}
|
||||
|
|
@ -663,7 +663,7 @@ puffs_fuse_node_mknod(struct puffs_cc *pcc, void *opc, void **newnode,
|
|||
}
|
||||
|
||||
set_fuse_context_uid_gid(pcn->pcn_cred);
|
||||
set_fuse_context_pid(pcn->pcn_pid);
|
||||
set_fuse_context_pid(pcn->pcn_cid);
|
||||
|
||||
/* wrap up return code */
|
||||
mode = puffs_addvtype2mode(va->va_mode, va->va_type);
|
||||
|
|
@ -691,7 +691,7 @@ puffs_fuse_node_mkdir(struct puffs_cc *pcc, void *opc, void **newnode,
|
|||
fuse = puffs_getspecific(pu);
|
||||
|
||||
set_fuse_context_uid_gid(pcn->pcn_cred);
|
||||
set_fuse_context_pid(pcn->pcn_pid);
|
||||
set_fuse_context_pid(pcn->pcn_cid);
|
||||
|
||||
if (fuse->op.mkdir == NULL) {
|
||||
return ENOSYS;
|
||||
|
|
@ -729,7 +729,7 @@ puffs_fuse_node_create(struct puffs_cc *pcc, void *opc, void **newnode,
|
|||
fuse = puffs_getspecific(pu);
|
||||
|
||||
set_fuse_context_uid_gid(pcn->pcn_cred);
|
||||
set_fuse_context_pid(pcn->pcn_pid);
|
||||
set_fuse_context_pid(pcn->pcn_cid);
|
||||
|
||||
created = 0;
|
||||
if (fuse->op.create) {
|
||||
|
|
@ -777,7 +777,7 @@ puffs_fuse_node_remove(struct puffs_cc *pcc, void *opc, void *targ,
|
|||
fuse = puffs_getspecific(pu);
|
||||
|
||||
set_fuse_context_uid_gid(pcn->pcn_cred);
|
||||
set_fuse_context_pid(pcn->pcn_pid);
|
||||
set_fuse_context_pid(pcn->pcn_cid);
|
||||
|
||||
if (fuse->op.unlink == NULL) {
|
||||
return ENOSYS;
|
||||
|
|
@ -804,7 +804,7 @@ puffs_fuse_node_rmdir(struct puffs_cc *pcc, void *opc, void *targ,
|
|||
fuse = puffs_getspecific(pu);
|
||||
|
||||
set_fuse_context_uid_gid(pcn->pcn_cred);
|
||||
set_fuse_context_pid(pcn->pcn_pid);
|
||||
set_fuse_context_pid(pcn->pcn_cid);
|
||||
|
||||
if (fuse->op.rmdir == NULL) {
|
||||
return ENOSYS;
|
||||
|
|
@ -831,7 +831,7 @@ puffs_fuse_node_symlink(struct puffs_cc *pcc, void *opc, void **newnode,
|
|||
fuse = puffs_getspecific(pu);
|
||||
|
||||
set_fuse_context_uid_gid(pcn_src->pcn_cred);
|
||||
set_fuse_context_pid(pcn_src->pcn_pid);
|
||||
set_fuse_context_pid(pcn_src->pcn_cid);
|
||||
|
||||
if (fuse->op.symlink == NULL) {
|
||||
return ENOSYS;
|
||||
|
|
@ -863,7 +863,7 @@ puffs_fuse_node_rename(struct puffs_cc *pcc, void *opc, void *src,
|
|||
fuse = puffs_getspecific(pu);
|
||||
|
||||
set_fuse_context_uid_gid(pcn_targ->pcn_cred);
|
||||
set_fuse_context_pid(pcn_targ->pcn_pid);
|
||||
set_fuse_context_pid(pcn_targ->pcn_cid);
|
||||
|
||||
if (fuse->op.rename == NULL) {
|
||||
return ENOSYS;
|
||||
|
|
@ -891,7 +891,7 @@ puffs_fuse_node_link(struct puffs_cc *pcc, void *opc, void *targ,
|
|||
fuse = puffs_getspecific(pu);
|
||||
|
||||
set_fuse_context_uid_gid(pcn->pcn_cred);
|
||||
set_fuse_context_pid(pcn->pcn_pid);
|
||||
set_fuse_context_pid(pcn->pcn_cid);
|
||||
|
||||
if (fuse->op.link == NULL) {
|
||||
return ENOSYS;
|
||||
|
|
@ -911,7 +911,8 @@ puffs_fuse_node_link(struct puffs_cc *pcc, void *opc, void *targ,
|
|||
/* ARGSUSED3 */
|
||||
static int
|
||||
puffs_fuse_node_setattr(struct puffs_cc *pcc, void *opc,
|
||||
const struct vattr *va, const struct puffs_cred *pcr, pid_t pid)
|
||||
const struct vattr *va, const struct puffs_cred *pcr,
|
||||
const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_usermount *pu = puffs_cc_getusermount(pcc);
|
||||
struct puffs_node *pn = opc;
|
||||
|
|
@ -921,7 +922,7 @@ puffs_fuse_node_setattr(struct puffs_cc *pcc, void *opc,
|
|||
fuse = puffs_getspecific(pu);
|
||||
|
||||
set_fuse_context_uid_gid(pcr);
|
||||
set_fuse_context_pid(pid);
|
||||
set_fuse_context_pid(pcid);
|
||||
|
||||
return fuse_setattr(fuse, pn, path, va);
|
||||
}
|
||||
|
|
@ -929,7 +930,7 @@ puffs_fuse_node_setattr(struct puffs_cc *pcc, void *opc,
|
|||
/* ARGSUSED2 */
|
||||
static int
|
||||
puffs_fuse_node_open(struct puffs_cc *pcc, void *opc, int mode,
|
||||
const struct puffs_cred *cred, pid_t pid)
|
||||
const struct puffs_cred *cred, const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_usermount *pu = puffs_cc_getusermount(pcc);
|
||||
struct puffs_node *pn = opc;
|
||||
|
|
@ -941,7 +942,7 @@ puffs_fuse_node_open(struct puffs_cc *pcc, void *opc, int mode,
|
|||
fuse = puffs_getspecific(pu);
|
||||
|
||||
set_fuse_context_uid_gid(cred);
|
||||
set_fuse_context_pid(pid);
|
||||
set_fuse_context_pid(pcid);
|
||||
|
||||
/* if open, don't open again, lest risk nuking file private info */
|
||||
if (rn->flags & RN_OPEN) {
|
||||
|
|
@ -969,7 +970,7 @@ puffs_fuse_node_open(struct puffs_cc *pcc, void *opc, int mode,
|
|||
/* ARGSUSED2 */
|
||||
static int
|
||||
puffs_fuse_node_close(struct puffs_cc *pcc, void *opc, int fflag,
|
||||
const struct puffs_cred *pcr, pid_t pid)
|
||||
const struct puffs_cred *pcr, const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_usermount *pu = puffs_cc_getusermount(pcc);
|
||||
struct puffs_node *pn = opc;
|
||||
|
|
@ -984,7 +985,7 @@ puffs_fuse_node_close(struct puffs_cc *pcc, void *opc, int fflag,
|
|||
ret = 0;
|
||||
|
||||
set_fuse_context_uid_gid(pcr);
|
||||
set_fuse_context_pid(pid);
|
||||
set_fuse_context_pid(pcid);
|
||||
|
||||
if (rn->flags & RN_OPEN) {
|
||||
if (pn->pn_va.va_type == VDIR) {
|
||||
|
|
@ -1145,26 +1146,28 @@ puffs_fuse_node_readdir(struct puffs_cc *pcc, void *opc, struct dirent *dent,
|
|||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
puffs_fuse_node_reclaim(struct puffs_cc *pcc, void *opc, pid_t pid)
|
||||
puffs_fuse_node_reclaim(struct puffs_cc *pcc, void *opc,
|
||||
const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_node *pn = opc;
|
||||
|
||||
nukern(pn);
|
||||
|
||||
set_fuse_context_pid(pid);
|
||||
set_fuse_context_pid(pcid);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* ARGSUSED1 */
|
||||
static int
|
||||
puffs_fuse_fs_unmount(struct puffs_cc *pcc, int flags, pid_t pid)
|
||||
puffs_fuse_fs_unmount(struct puffs_cc *pcc, int flags,
|
||||
const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_usermount *pu = puffs_cc_getusermount(pcc);
|
||||
struct fuse *fuse;
|
||||
|
||||
fuse = puffs_getspecific(pu);
|
||||
set_fuse_context_pid(pid);
|
||||
set_fuse_context_pid(pcid);
|
||||
if (fuse->op.destroy == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1175,23 +1178,24 @@ puffs_fuse_fs_unmount(struct puffs_cc *pcc, int flags, pid_t pid)
|
|||
/* ARGSUSED0 */
|
||||
static int
|
||||
puffs_fuse_fs_sync(struct puffs_cc *pcc, int flags,
|
||||
const struct puffs_cred *cr, pid_t pid)
|
||||
const struct puffs_cred *cr, const struct puffs_cid *pcid)
|
||||
{
|
||||
set_fuse_context_uid_gid(cr);
|
||||
set_fuse_context_pid(pid);
|
||||
set_fuse_context_pid(pcid);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* ARGSUSED2 */
|
||||
static int
|
||||
puffs_fuse_fs_statvfs(struct puffs_cc *pcc, struct statvfs *svfsb, pid_t pid)
|
||||
puffs_fuse_fs_statvfs(struct puffs_cc *pcc, struct statvfs *svfsb,
|
||||
const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_usermount *pu = puffs_cc_getusermount(pcc);
|
||||
struct fuse *fuse;
|
||||
int ret;
|
||||
|
||||
fuse = puffs_getspecific(pu);
|
||||
set_fuse_context_pid(pid);
|
||||
set_fuse_context_pid(pcid);
|
||||
if (fuse->op.statfs == NULL) {
|
||||
if ((ret = statvfs(PNPATH(puffs_getroot(pu)), svfsb)) == -1) {
|
||||
return errno;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dtfs_vfsops.c,v 1.19 2007/06/06 01:55:02 pooka Exp $ */
|
||||
/* $NetBSD: dtfs_vfsops.c,v 1.20 2007/07/01 17:23:44 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
|
||||
|
|
@ -191,7 +191,8 @@ dtfs_domount(struct puffs_usermount *pu, const char *typestr)
|
|||
#define ROUND(a,b) (((a) + ((b)-1)) & ~((b)-1))
|
||||
#define NFILES 1024*1024
|
||||
int
|
||||
dtfs_fs_statvfs(struct puffs_cc *pcc, struct statvfs *sbp, pid_t pid)
|
||||
dtfs_fs_statvfs(struct puffs_cc *pcc, struct statvfs *sbp,
|
||||
const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_usermount *pu;
|
||||
struct rlimit rlim;
|
||||
|
|
@ -302,7 +303,7 @@ dtfs_fs_suspend(struct puffs_cc *pcc, int status)
|
|||
}
|
||||
|
||||
int
|
||||
dtfs_fs_unmount(struct puffs_cc *pcc, int flags, pid_t pid)
|
||||
dtfs_fs_unmount(struct puffs_cc *pcc, int flags, const struct puffs_cid *pcid)
|
||||
{
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dtfs_vnops.c,v 1.29 2007/07/01 15:32:02 pooka Exp $ */
|
||||
/* $NetBSD: dtfs_vnops.c,v 1.30 2007/07/01 17:23:44 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
|
||||
|
|
@ -82,7 +82,7 @@ dtfs_node_lookup(struct puffs_cc *pcc, void *opc, void **newnode,
|
|||
|
||||
int
|
||||
dtfs_node_access(struct puffs_cc *pcc, void *opc, int acc_mode,
|
||||
const struct puffs_cred *pcr, pid_t pid)
|
||||
const struct puffs_cred *pcr, const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_node *pn = opc;
|
||||
|
||||
|
|
@ -92,7 +92,8 @@ dtfs_node_access(struct puffs_cc *pcc, void *opc, int acc_mode,
|
|||
|
||||
int
|
||||
dtfs_node_getattr(struct puffs_cc *pcc, void *opc,
|
||||
struct vattr *va, const struct puffs_cred *pcr, pid_t pid)
|
||||
struct vattr *va, const struct puffs_cred *pcr,
|
||||
const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_node *pn = opc;
|
||||
|
||||
|
|
@ -103,7 +104,8 @@ dtfs_node_getattr(struct puffs_cc *pcc, void *opc,
|
|||
|
||||
int
|
||||
dtfs_node_setattr(struct puffs_cc *pcc, void *opc,
|
||||
const struct vattr *va, const struct puffs_cred *pcr, pid_t pid)
|
||||
const struct vattr *va, const struct puffs_cred *pcr,
|
||||
const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_node *pn = opc;
|
||||
int rv;
|
||||
|
|
@ -272,7 +274,8 @@ dtfs_node_readdir(struct puffs_cc *pcc, void *opc,
|
|||
}
|
||||
|
||||
int
|
||||
dtfs_node_poll(struct puffs_cc *pcc, void *opc, int *events, pid_t pid)
|
||||
dtfs_node_poll(struct puffs_cc *pcc, void *opc, int *events,
|
||||
const struct puffs_cid *pcid)
|
||||
{
|
||||
struct dtfs_mount *dtm = puffs_cc_getspecific(pcc);
|
||||
struct dtfs_poll dp;
|
||||
|
|
@ -486,7 +489,7 @@ dtfs_node_write(struct puffs_cc *pcc, void *opc, uint8_t *buf,
|
|||
}
|
||||
|
||||
int
|
||||
dtfs_node_reclaim(struct puffs_cc *pcc, void *opc, pid_t pid)
|
||||
dtfs_node_reclaim(struct puffs_cc *pcc, void *opc, const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_node *pn = opc;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: sysctlfs.c,v 1.25 2007/06/24 22:25:49 pooka Exp $ */
|
||||
/* $NetBSD: sysctlfs.c,v 1.26 2007/07/01 17:23:44 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
|
||||
|
|
@ -484,7 +484,7 @@ sysctlfs_node_lookup(struct puffs_cc *pcc, void *opc, void **newnode,
|
|||
|
||||
int
|
||||
sysctlfs_node_getattr(struct puffs_cc *pcc, void *opc, struct vattr *va,
|
||||
const struct puffs_cred *pcr, pid_t pid)
|
||||
const struct puffs_cred *pcr, const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_node *pn = opc;
|
||||
struct sfsnode *sfs = pn->pn_data;
|
||||
|
|
@ -513,7 +513,8 @@ sysctlfs_node_getattr(struct puffs_cc *pcc, void *opc, struct vattr *va,
|
|||
|
||||
int
|
||||
sysctlfs_node_setattr(struct puffs_cc *pcc, void *opc,
|
||||
const struct vattr *va, const struct puffs_cred *pcr, pid_t pid)
|
||||
const struct vattr *va, const struct puffs_cred *pcr,
|
||||
const struct puffs_cid *pcid)
|
||||
{
|
||||
|
||||
/* dummy, but required for write */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: fs.c,v 1.3 2007/05/11 11:43:08 pooka Exp $ */
|
||||
/* $NetBSD: fs.c,v 1.4 2007/07/01 17:23:44 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
__RCSID("$NetBSD: fs.c,v 1.3 2007/05/11 11:43:08 pooka Exp $");
|
||||
__RCSID("$NetBSD: fs.c,v 1.4 2007/07/01 17:23:44 pooka Exp $");
|
||||
#endif /* !lint */
|
||||
|
||||
#include <err.h>
|
||||
|
|
@ -154,7 +154,8 @@ p9p_handshake(struct puffs_usermount *pu, const char *username)
|
|||
}
|
||||
|
||||
int
|
||||
puffs9p_fs_unmount(struct puffs_cc *pcc, int flags, pid_t pid)
|
||||
puffs9p_fs_unmount(struct puffs_cc *pcc, int flags,
|
||||
const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_usermount *pu = puffs_cc_getusermount(pcc);
|
||||
struct puffs9p *p9p = puffs_getspecific(pu);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: node.c,v 1.13 2007/06/24 19:13:39 pooka Exp $ */
|
||||
/* $NetBSD: node.c,v 1.14 2007/07/01 17:23:44 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
__RCSID("$NetBSD: node.c,v 1.13 2007/06/24 19:13:39 pooka Exp $");
|
||||
__RCSID("$NetBSD: node.c,v 1.14 2007/07/01 17:23:44 pooka Exp $");
|
||||
#endif /* !lint */
|
||||
|
||||
#include <assert.h>
|
||||
|
|
@ -172,7 +172,7 @@ puffs9p_node_readdir(struct puffs_cc *pcc, void *opc, struct dirent *dent,
|
|||
|
||||
int
|
||||
puffs9p_node_getattr(struct puffs_cc *pcc, void *opc, struct vattr *vap,
|
||||
const struct puffs_cred *pcr, pid_t pid)
|
||||
const struct puffs_cred *pcr, const struct puffs_cid *pcid)
|
||||
{
|
||||
AUTOVAR(pcc);
|
||||
struct puffs_node *pn = opc;
|
||||
|
|
@ -195,7 +195,8 @@ puffs9p_node_getattr(struct puffs_cc *pcc, void *opc, struct vattr *vap,
|
|||
|
||||
int
|
||||
puffs9p_node_setattr(struct puffs_cc *pcc, void *opc,
|
||||
const struct vattr *va, const struct puffs_cred *pcr, pid_t pid)
|
||||
const struct vattr *va, const struct puffs_cred *pcr,
|
||||
const struct puffs_cid *pcid)
|
||||
{
|
||||
AUTOVAR(pcc);
|
||||
struct puffs_node *pn = opc;
|
||||
|
|
@ -228,7 +229,7 @@ puffs9p_node_setattr(struct puffs_cc *pcc, void *opc,
|
|||
*/
|
||||
int
|
||||
puffs9p_node_open(struct puffs_cc *pcc, void *opc, int mode,
|
||||
const struct puffs_cred *pcr, pid_t pid)
|
||||
const struct puffs_cred *pcr, const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs9p *p9p = puffs_cc_getspecific(pcc);
|
||||
struct puffs_node *pn = opc;
|
||||
|
|
@ -260,8 +261,8 @@ puffs9p_node_open(struct puffs_cc *pcc, void *opc, int mode,
|
|||
}
|
||||
|
||||
int
|
||||
puffs9p_node_inactive(struct puffs_cc *pcc, void *opc, pid_t pid,
|
||||
int *refcount)
|
||||
puffs9p_node_inactive(struct puffs_cc *pcc, void *opc,
|
||||
const struct puffs_cid *pcid, int *refcount)
|
||||
{
|
||||
struct puffs_node *pn = opc;
|
||||
struct p9pnode *p9n = pn->pn_data;
|
||||
|
|
@ -571,7 +572,8 @@ puffs9p_node_rename(struct puffs_cc *pcc, void *opc, void *src,
|
|||
* - "thanks"
|
||||
*/
|
||||
int
|
||||
puffs9p_node_reclaim(struct puffs_cc *pcc, void *opc, pid_t pid)
|
||||
puffs9p_node_reclaim(struct puffs_cc *pcc, void *opc,
|
||||
const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_node *pn = opc;
|
||||
struct p9pnode *p9n = pn->pn_data;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: fs.c,v 1.11 2007/06/06 01:55:03 pooka Exp $ */
|
||||
/* $NetBSD: fs.c,v 1.12 2007/07/01 17:23:45 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
__RCSID("$NetBSD: fs.c,v 1.11 2007/06/06 01:55:03 pooka Exp $");
|
||||
__RCSID("$NetBSD: fs.c,v 1.12 2007/07/01 17:23:45 pooka Exp $");
|
||||
#endif /* !lint */
|
||||
|
||||
#include <err.h>
|
||||
|
|
@ -129,7 +129,7 @@ psshfs_domount(struct puffs_usermount *pu)
|
|||
}
|
||||
|
||||
int
|
||||
psshfs_fs_unmount(struct puffs_cc *pcc, int flags, pid_t pid)
|
||||
psshfs_fs_unmount(struct puffs_cc *pcc, int flags, const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_usermount *pu = puffs_cc_getusermount(pcc);
|
||||
struct psshfs_ctx *pctx = puffs_getspecific(pu);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: node.c,v 1.30 2007/06/06 01:55:03 pooka Exp $ */
|
||||
/* $NetBSD: node.c,v 1.31 2007/07/01 17:23:45 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
__RCSID("$NetBSD: node.c,v 1.30 2007/06/06 01:55:03 pooka Exp $");
|
||||
__RCSID("$NetBSD: node.c,v 1.31 2007/07/01 17:23:45 pooka Exp $");
|
||||
#endif /* !lint */
|
||||
|
||||
#include <assert.h>
|
||||
|
|
@ -107,7 +107,7 @@ psshfs_node_lookup(struct puffs_cc *pcc, void *opc, void **newnode,
|
|||
|
||||
int
|
||||
psshfs_node_getattr(struct puffs_cc *pcc, void *opc, struct vattr *vap,
|
||||
const struct puffs_cred *pcr, pid_t pid)
|
||||
const struct puffs_cred *pcr, const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_node *pn = opc;
|
||||
int rv;
|
||||
|
|
@ -123,7 +123,8 @@ psshfs_node_getattr(struct puffs_cc *pcc, void *opc, struct vattr *vap,
|
|||
|
||||
int
|
||||
psshfs_node_setattr(struct puffs_cc *pcc, void *opc,
|
||||
const struct vattr *va, const struct puffs_cred *pcr, pid_t pid)
|
||||
const struct vattr *va, const struct puffs_cred *pcr,
|
||||
const struct puffs_cid *pcid)
|
||||
{
|
||||
PSSHFSAUTOVAR(pcc);
|
||||
struct vattr kludgeva;
|
||||
|
|
@ -202,7 +203,7 @@ psshfs_node_create(struct puffs_cc *pcc, void *opc, void **newnode,
|
|||
|
||||
int
|
||||
psshfs_node_open(struct puffs_cc *pcc, void *opc, int mode,
|
||||
const struct puffs_cred *pcr, pid_t pid)
|
||||
const struct puffs_cred *pcr, const struct puffs_cid *pcid)
|
||||
{
|
||||
PSSHFSAUTOVAR(pcc);
|
||||
struct vattr va;
|
||||
|
|
@ -241,7 +242,8 @@ psshfs_node_open(struct puffs_cc *pcc, void *opc, int mode,
|
|||
}
|
||||
|
||||
int
|
||||
psshfs_node_inactive(struct puffs_cc *pcc, void *opc, pid_t pid, int *refcount)
|
||||
psshfs_node_inactive(struct puffs_cc *pcc, void *opc,
|
||||
const struct puffs_cid *pcid, int *refcount)
|
||||
{
|
||||
struct psshfs_ctx *pctx = puffs_cc_getspecific(pcc);
|
||||
struct puffs_usermount *pu = puffs_cc_getusermount(pcc);
|
||||
|
|
@ -585,7 +587,8 @@ psshfs_node_rename(struct puffs_cc *pcc, void *opc, void *src,
|
|||
* bit.
|
||||
*/
|
||||
int
|
||||
psshfs_node_reclaim(struct puffs_cc *pcc, void *opc, pid_t pid)
|
||||
psshfs_node_reclaim(struct puffs_cc *pcc, void *opc,
|
||||
const struct puffs_cid *pcid)
|
||||
{
|
||||
struct puffs_usermount *pu = puffs_cc_getusermount(pcc);
|
||||
struct puffs_node *pn = opc, *pn_next, *pn_root;
|
||||
|
|
|
|||
Loading…
Reference in New Issue