diff options
| author | phk <phk@FreeBSD.org> | 1995-12-11 10:26:34 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1995-12-11 10:26:34 +0000 |
| commit | d7af2f0a80cee1f5b4fa606c79490ec68445ee7b (patch) | |
| tree | 9f889a0ba8039bcdcf9a8a0bb44138b5aa03e604 /sys/miscfs/fifofs | |
| parent | 9d7b5a978311c14182c43b70f2326db0809f2d25 (diff) | |
| download | FreeBSD-src-d7af2f0a80cee1f5b4fa606c79490ec68445ee7b.zip FreeBSD-src-d7af2f0a80cee1f5b4fa606c79490ec68445ee7b.tar.gz | |
Back out this one, must have screwed up somewhere :-(
Diffstat (limited to 'sys/miscfs/fifofs')
| -rw-r--r-- | sys/miscfs/fifofs/fifo.h | 6 | ||||
| -rw-r--r-- | sys/miscfs/fifofs/fifo_vnops.c | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h index 95c1a98..c54d3d7 100644 --- a/sys/miscfs/fifofs/fifo.h +++ b/sys/miscfs/fifofs/fifo.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo.h 8.2 (Berkeley) 2/2/94 - * $Id: fifo.h,v 1.7 1995/11/21 12:53:52 bde Exp $ + * $Id: fifo.h,v 1.8 1995/12/11 09:24:09 phk Exp $ */ extern vop_t **fifo_vnodeop_p; @@ -40,6 +40,7 @@ extern vop_t **fifo_vnodeop_p; * Prototypes for fifo operations on vnodes. */ int fifo_badop __P((void)); +int fifo_ebadf __P((void)); int fifo_printinfo __P((struct vnode *)); int fifo_lookup __P((struct vop_lookup_args *)); #define fifo_create ((int (*) __P((struct vop_create_args *)))fifo_badop) @@ -67,8 +68,11 @@ int fifo_select __P((struct vop_select_args *)); #define fifo_abortop ((int (*) __P((struct vop_abortop_args *)))fifo_badop) #define fifo_inactive ((int (*) __P((struct vop_inactive_args *)))nullop) #define fifo_reclaim ((int (*) __P((struct vop_reclaim_args *)))nullop) +int fifo_lock __P((struct vop_lock_args *)); +int fifo_unlock __P((struct vop_unlock_args *)); int fifo_bmap __P((struct vop_bmap_args *)); #define fifo_strategy ((int (*) __P((struct vop_strategy_args *)))fifo_badop) +int fifo_print __P((struct vop_print_args *)); #define fifo_islocked ((int (*) __P((struct vop_islocked_args *)))nullop) int fifo_pathconf __P((struct vop_pathconf_args *)); int fifo_advlock __P((struct vop_advlock_args *)); diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index ecf072d..b274365 100644 --- a/sys/miscfs/fifofs/fifo_vnops.c +++ b/sys/miscfs/fifofs/fifo_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.2 (Berkeley) 1/4/94 - * $Id: fifo_vnops.c,v 1.12 1995/11/09 08:15:27 bde Exp $ + * $Id: fifo_vnops.c,v 1.13 1995/12/11 09:24:13 phk Exp $ */ #include <sys/param.h> @@ -63,7 +63,7 @@ struct fifoinfo { }; vop_t **fifo_vnodeop_p; -static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = { +struct vnodeopv_entry_desc fifo_vnodeop_entries[] = { { &vop_default_desc, (vop_t *)vn_default_error }, { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ { &vop_create_desc, (vop_t *)fifo_create }, /* create */ @@ -107,7 +107,7 @@ static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = { { &vop_bwrite_desc, (vop_t *)fifo_bwrite }, /* bwrite */ { NULL, NULL } }; -static struct vnodeopv_desc fifo_vnodeop_opv_desc = +struct vnodeopv_desc fifo_vnodeop_opv_desc = { &fifo_vnodeop_p, fifo_vnodeop_entries }; VNODEOP_SET(fifo_vnodeop_opv_desc); @@ -382,7 +382,7 @@ fifo_bmap(ap) * At the moment we do not do any locking. */ /* ARGSUSED */ -static int +int fifo_lock(ap) struct vop_lock_args /* { struct vnode *a_vp; @@ -393,7 +393,7 @@ fifo_lock(ap) } /* ARGSUSED */ -static int +int fifo_unlock(ap) struct vop_unlock_args /* { struct vnode *a_vp; @@ -459,7 +459,7 @@ fifo_printinfo(vp) /* * Print out the contents of a fifo vnode. */ -static int +int fifo_print(ap) struct vop_print_args /* { struct vnode *a_vp; @@ -503,7 +503,7 @@ fifo_pathconf(ap) /* * Fifo failed operation */ -static int +int fifo_ebadf() { |
