Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapt to puffs_framebuf changes

Browse Source
This commit is contained in:
pooka 2007-07-07 21:14:26 +00:00
parent 8c9c68dbc2
commit bfecc30afc
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/puffs/mount_9p/nineproto.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nineproto.c,v 1.7 2007/05/16 09:57:21 pooka Exp $ */
/* $NetBSD: nineproto.c,v 1.8 2007/07/07 21:14:28 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: nineproto.c,v 1.7 2007/05/16 09:57:21 pooka Exp $");
__RCSID("$NetBSD: nineproto.c,v 1.8 2007/07/07 21:14:28 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
@ -221,7 +221,7 @@ proto_cc_clunkfid(struct puffs_cc *pcc, p9pfid_t fid, int waitforit)
p9pbuf_put_4(pb, fid);
if (waitforit) {
if (puffs_framev_enqueue_cc(pcc, p9p->servsock, pb) == 0) {
if (puffs_framev_enqueue_cc(pcc, p9p->servsock, pb, 0) == 0) {
if (p9pbuf_get_type(pb) != P9PROTO_R_CLUNK)
rv = EPROTO;
} else {

7
usr.sbin/puffs/mount_9p/ninepuffs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ninepuffs.c,v 1.12 2007/05/19 10:38:23 pooka Exp $ */
/* $NetBSD: ninepuffs.c,v 1.13 2007/07/07 21:14:28 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: ninepuffs.c,v 1.12 2007/05/19 10:38:23 pooka Exp $");
__RCSID("$NetBSD: ninepuffs.c,v 1.13 2007/07/07 21:14:28 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
@ -189,7 +189,8 @@ main(int argc, char *argv[])
puffs_framev_init(pu, p9pbuf_read, p9pbuf_write, p9pbuf_cmp,
puffs_framev_unmountonclose);
if (puffs_framev_addfd(pu, p9p.servsock) == -1)
if (puffs_framev_addfd(pu, p9p.servsock,
PUFFS_FBIO_READ | PUFFS_FBIO_WRITE) == -1)
err(1, "puffs_framebuf_addfd");
if (puffs_mount(pu, argv[2], mntflags, pn_root) == -1)

8
usr.sbin/puffs/mount_9p/ninepuffs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ninepuffs.h,v 1.8 2007/05/16 09:57:21 pooka Exp $ */
/* $NetBSD: ninepuffs.h,v 1.9 2007/07/07 21:14:28 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@ -73,7 +73,7 @@ typedef uint32_t p9pfid_t;
#define GETRESPONSE(pb) \
do { \
if (puffs_framev_enqueue_cc(pcc, p9p->servsock, pb) == -1) { \
if (puffs_framev_enqueue_cc(pcc, p9p->servsock, pb, 0) == -1) { \
rv = errno; \
goto out; \
} \
@ -81,7 +81,7 @@ do { \
#define JUSTSEND(pb) \
do { \
if (puffs_framev_enqueue_justsend(pu,p9p->servsock,pb,1) == -1){\
if (puffs_framev_enqueue_justsend(pu,p9p->servsock,pb,1,0)==-1){\
rv = errno; \
goto out; \
} \
@ -89,7 +89,7 @@ do { \
#define SENDCB(pb, f, a) \
do { \
if (puffs_framev_enqueue_cb(pu, p9p->servsock, pb, f,a) == -1) {\
if (puffs_framev_enqueue_cb(pu, p9p->servsock,pb,f,a,0) == -1) {\
rv = errno; \
goto out; \
} \

7
usr.sbin/puffs/mount_psshfs/psshfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: psshfs.c,v 1.30 2007/06/26 13:20:34 pooka Exp $ */
/* $NetBSD: psshfs.c,v 1.31 2007/07/07 21:14:26 pooka Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: psshfs.c,v 1.30 2007/06/26 13:20:34 pooka Exp $");
__RCSID("$NetBSD: psshfs.c,v 1.31 2007/07/07 21:14:26 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
@ -205,7 +205,8 @@ main(int argc, char *argv[])
puffs_framev_init(pu, psbuf_read, psbuf_write, psbuf_cmp,
puffs_framev_unmountonclose);
if (puffs_framev_addfd(pu, pctx.sshfd) == -1)
if (puffs_framev_addfd(pu, pctx.sshfd,
PUFFS_FBIO_READ | PUFFS_FBIO_WRITE) == -1)
err(1, "framebuf addfd");
if (puffs_mount(pu, argv[1], mntflags, puffs_getroot(pu)) == -1)

8
usr.sbin/puffs/mount_psshfs/psshfs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: psshfs.h,v 1.20 2007/06/06 01:55:03 pooka Exp $ */
/* $NetBSD: psshfs.h,v 1.21 2007/07/07 21:14:27 pooka Exp $ */
/*
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@ -61,7 +61,7 @@ PUFFSOP_PROTOS(psshfs);
#define GETRESPONSE(pb) \
do { \
if (puffs_framev_enqueue_cc(pcc, pctx->sshfd, pb) == -1) { \
if (puffs_framev_enqueue_cc(pcc, pctx->sshfd, pb, 0) == -1) { \
rv = errno; \
goto out; \
} \
@ -69,7 +69,7 @@ do { \
#define JUSTSEND(pb) \
do { \
if (puffs_framev_enqueue_justsend(pu,pctx->sshfd,pb,1) == -1) { \
if (puffs_framev_enqueue_justsend(pu,pctx->sshfd,pb,1,0) == -1){\
rv = errno; \
goto out; \
} \
@ -77,7 +77,7 @@ do { \
#define SENDCB(pb, f, a) \
do { \
if (puffs_framev_enqueue_cb(pu, pctx->sshfd, pb, f,a) == -1) { \
if (puffs_framev_enqueue_cb(pu, pctx->sshfd, pb,f,a,0) == -1) { \
rv = errno; \
goto out; \
} \