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

* nuke puffs_cc_get{specific,usermount} for good 

* move prototypes for puffs_docc and puffs_dopufbuf into the
  public header, as they are should be exposed
This commit is contained in:
pooka 2007-12-16 20:02:57 +00:00
parent 369391b0a0
commit 08c7b6138e
5 changed files with 20 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libpuffs/callcontext.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: callcontext.c,v 1.15 2007/12/04 21:24:10 pooka Exp $ */ /* $NetBSD: callcontext.c,v 1.16 2007/12/16 20:02:57 pooka Exp $ */
/* /*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved. * Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@ -27,7 +27,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#if !defined(lint) #if !defined(lint)
__RCSID("$NetBSD: callcontext.c,v 1.15 2007/12/04 21:24:10 pooka Exp $"); __RCSID("$NetBSD: callcontext.c,v 1.16 2007/12/16 20:02:57 pooka Exp $");
#endif /* !lint */ #endif /* !lint */
#include <sys/types.h> #include <sys/types.h>
@ -98,20 +98,6 @@ puffs_cc_schedule(struct puffs_cc *pcc)
TAILQ_INSERT_TAIL(&pu->pu_sched, pcc, entries); TAILQ_INSERT_TAIL(&pu->pu_sched, pcc, entries);
} }
struct puffs_usermount *
puffs_cc_getusermount(struct puffs_cc *pcc)
{
return pcc->pcc_pu;
}
void *
puffs_cc_getspecific(struct puffs_cc *pcc)
{
return puffs_getspecific(pcc->pcc_pu);
}
int int
puffs_cc_getcaller(struct puffs_cc *pcc, pid_t *pid, lwpid_t *lid) puffs_cc_getcaller(struct puffs_cc *pcc, pid_t *pid, lwpid_t *lid)
{ {

12
lib/libpuffs/dispatcher.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dispatcher.c,v 1.26 2007/12/08 19:57:03 pooka Exp $ */ /* $NetBSD: dispatcher.c,v 1.27 2007/12/16 20:02:57 pooka Exp $ */
/* /*
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved. * Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@ -30,7 +30,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#if !defined(lint) #if !defined(lint)
__RCSID("$NetBSD: dispatcher.c,v 1.26 2007/12/08 19:57:03 pooka Exp $"); __RCSID("$NetBSD: dispatcher.c,v 1.27 2007/12/16 20:02:57 pooka Exp $");
#endif /* !lint */ #endif /* !lint */
#include <sys/types.h> #include <sys/types.h>
@ -49,7 +49,7 @@ __RCSID("$NetBSD: dispatcher.c,v 1.26 2007/12/08 19:57:03 pooka Exp $");
#include "puffs_priv.h" #include "puffs_priv.h"
static void processresult(struct puffs_cc *, int); static void processresult(struct puffs_usermount *, int);
/* /*
* Set the following to 1 to not handle each request on a separate * Set the following to 1 to not handle each request on a separate
@ -1013,13 +1013,13 @@ puffs_calldispatcher(struct puffs_cc *pcc)
* off of the continuation stack. Otherwise puffs_goto() would * off of the continuation stack. Otherwise puffs_goto() would
* not work. * not work.
*/ */
processresult(pcc, rv); processresult(pu, rv);
} }
static void static void
processresult(struct puffs_cc *pcc, int how) processresult(struct puffs_usermount *pu, int how)
{ {
struct puffs_usermount *pu = puffs_cc_getusermount(pcc); struct puffs_cc *pcc = puffs_cc_getcc(pu);
struct puffs_req *preq = puffs__framebuf_getdataptr(pcc->pcc_pb); struct puffs_req *preq = puffs__framebuf_getdataptr(pcc->pcc_pb);
int pccflags = pcc->pcc_flags; int pccflags = pcc->pcc_flags;

12
lib/libpuffs/framebuf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: framebuf.c,v 1.25 2007/12/04 21:24:11 pooka Exp $ */ /* $NetBSD: framebuf.c,v 1.26 2007/12/16 20:02:57 pooka Exp $ */
/* /*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved. * Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@ -35,7 +35,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#if !defined(lint) #if !defined(lint)
__RCSID("$NetBSD: framebuf.c,v 1.25 2007/12/04 21:24:11 pooka Exp $"); __RCSID("$NetBSD: framebuf.c,v 1.26 2007/12/16 20:02:57 pooka Exp $");
#endif /* !lint */ #endif /* !lint */
#include <sys/types.h> #include <sys/types.h>
@ -355,7 +355,7 @@ int
puffs_framev_enqueue_cc(struct puffs_cc *pcc, int fd, puffs_framev_enqueue_cc(struct puffs_cc *pcc, int fd,
struct puffs_framebuf *pufbuf, int flags) struct puffs_framebuf *pufbuf, int flags)
{ {
struct puffs_usermount *pu = puffs_cc_getusermount(pcc); struct puffs_usermount *pu = pcc->pcc_pu;
struct puffs_fctrl_io *fio; struct puffs_fctrl_io *fio;
/* /*
@ -444,7 +444,7 @@ int
puffs_framev_enqueue_directreceive(struct puffs_cc *pcc, int fd, puffs_framev_enqueue_directreceive(struct puffs_cc *pcc, int fd,
struct puffs_framebuf *pufbuf, int flags /* used in the future */) struct puffs_framebuf *pufbuf, int flags /* used in the future */)
{ {
struct puffs_usermount *pu = puffs_cc_getusermount(pcc); struct puffs_usermount *pu = pcc->pcc_pu;
struct puffs_fctrl_io *fio; struct puffs_fctrl_io *fio;
fio = getfiobyfd(pu, fd); fio = getfiobyfd(pu, fd);
@ -478,7 +478,7 @@ int
puffs_framev_enqueue_directsend(struct puffs_cc *pcc, int fd, puffs_framev_enqueue_directsend(struct puffs_cc *pcc, int fd,
struct puffs_framebuf *pufbuf, int flags) struct puffs_framebuf *pufbuf, int flags)
{ {
struct puffs_usermount *pu = puffs_cc_getusermount(pcc); struct puffs_usermount *pu = pcc->pcc_pu;
struct puffs_fctrl_io *fio; struct puffs_fctrl_io *fio;
if (flags & PUFFS_FBQUEUE_URGENT) if (flags & PUFFS_FBQUEUE_URGENT)
@ -528,7 +528,7 @@ puffs_framev_framebuf_ccpromote(struct puffs_framebuf *pufbuf,
int int
puffs_framev_enqueue_waitevent(struct puffs_cc *pcc, int fd, int *what) puffs_framev_enqueue_waitevent(struct puffs_cc *pcc, int fd, int *what)
{ {
struct puffs_usermount *pu = puffs_cc_getusermount(pcc); struct puffs_usermount *pu = pcc->pcc_pu;
struct puffs_fctrl_io *fio; struct puffs_fctrl_io *fio;
struct puffs_fbevent feb; struct puffs_fbevent feb;
struct kevent kev; struct kevent kev;

8
lib/libpuffs/puffs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: puffs.h,v 1.100 2007/12/11 20:17:26 pooka Exp $ */ /* $NetBSD: puffs.h,v 1.101 2007/12/16 20:02:58 pooka Exp $ */
/* /*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved. * Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@ -460,6 +460,9 @@ void puffs_vattr_null(struct vattr *);
void puffs_null_setops(struct puffs_ops *); void puffs_null_setops(struct puffs_ops *);
int puffs_dopufbuf(struct puffs_usermount *,
struct puffs_framebuf *);
/* /*
* generic/dummy routines applicable for some file systems * generic/dummy routines applicable for some file systems
*/ */
@ -518,10 +521,9 @@ int puffs_access_times(uid_t, gid_t, mode_t, int,
void puffs_cc_yield(struct puffs_cc *); void puffs_cc_yield(struct puffs_cc *);
void puffs_cc_continue(struct puffs_cc *); void puffs_cc_continue(struct puffs_cc *);
void puffs_cc_schedule(struct puffs_cc *); void puffs_cc_schedule(struct puffs_cc *);
struct puffs_usermount *puffs_cc_getusermount(struct puffs_cc *);
void *puffs_cc_getspecific(struct puffs_cc *);
int puffs_cc_getcaller(struct puffs_cc *,pid_t *,lwpid_t *); int puffs_cc_getcaller(struct puffs_cc *,pid_t *,lwpid_t *);
struct puffs_cc *puffs_cc_getcc(struct puffs_usermount *); struct puffs_cc *puffs_cc_getcc(struct puffs_usermount *);
void *puffs_docc(void *);
/* /*
* Flushing / invalidation routines * Flushing / invalidation routines

5
lib/libpuffs/puffs_priv.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: puffs_priv.h,v 1.35 2007/12/08 19:57:03 pooka Exp $ */ /* $NetBSD: puffs_priv.h,v 1.36 2007/12/16 20:02:58 pooka Exp $ */
/* /*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved. * Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@ -243,9 +243,6 @@ int puffs_fsframe_cmp(struct puffs_usermount *, struct puffs_framebuf *,
void puffs_fsframe_gotframe(struct puffs_usermount *, void puffs_fsframe_gotframe(struct puffs_usermount *,
struct puffs_framebuf *); struct puffs_framebuf *);
int puffs_dopufbuf(struct puffs_usermount *, struct puffs_framebuf *);
void *puffs_docc(void *);
uint64_t puffs__nextreq(struct puffs_usermount *pu); uint64_t puffs__nextreq(struct puffs_usermount *pu);
__END_DECLS __END_DECLS