Add function protypes for the new Lite2 unionfs functions.
This commit is contained in:
parent
1a46116d9d
commit
72a5ee14de
@ -101,6 +101,7 @@ extern int union_allocvp __P((struct vnode **, struct mount *,
|
||||
extern int union_freevp __P((struct vnode *));
|
||||
extern int union_copyfile __P((struct vnode *, struct vnode *,
|
||||
struct ucred *, struct proc *));
|
||||
extern struct vnode *union_dircache __P((struct vnode *, struct proc *));
|
||||
extern int union_copyup __P((struct union_node *, int, struct ucred *,
|
||||
struct proc *));
|
||||
extern int union_dowhiteout __P((struct union_node *, struct ucred *,
|
||||
|
@ -68,8 +68,12 @@ extern int union_init __P((void));
|
||||
static LIST_HEAD(unhead, union_node) unhead[NHASH];
|
||||
static int unvplock[NHASH];
|
||||
|
||||
static void union_dircache_r __P((struct vnode *, struct vnode ***, int *));
|
||||
static int union_list_lock __P((int ix));
|
||||
static void union_list_unlock __P((int ix));
|
||||
static int union_relookup __P((struct union_mount *, struct vnode *,
|
||||
struct vnode **, struct componentname *,
|
||||
struct componentname *, char *, int));
|
||||
extern void union_updatevp __P((struct union_node *un,
|
||||
struct vnode *uppervp,
|
||||
struct vnode *lowervp));
|
||||
|
@ -72,6 +72,7 @@ extern int union_getattr __P((struct vop_getattr_args *ap));
|
||||
extern int union_inactive __P((struct vop_inactive_args *ap));
|
||||
extern int union_ioctl __P((struct vop_ioctl_args *ap));
|
||||
extern int union_islocked __P((struct vop_islocked_args *ap));
|
||||
extern int union_lease __P((struct vop_lease_args *ap));
|
||||
extern int union_link __P((struct vop_link_args *ap));
|
||||
extern int union_lock __P((struct vop_lock_args *ap));
|
||||
extern int union_lookup __P((struct vop_lookup_args *ap));
|
||||
@ -90,6 +91,7 @@ extern int union_readlink __P((struct vop_readlink_args *ap));
|
||||
extern int union_reclaim __P((struct vop_reclaim_args *ap));
|
||||
extern int union_remove __P((struct vop_remove_args *ap));
|
||||
extern int union_rename __P((struct vop_rename_args *ap));
|
||||
extern int union_revoke __P((struct vop_revoke_args *ap));
|
||||
extern int union_rmdir __P((struct vop_rmdir_args *ap));
|
||||
extern int union_seek __P((struct vop_seek_args *ap));
|
||||
extern int union_select __P((struct vop_select_args *ap));
|
||||
@ -97,6 +99,7 @@ extern int union_setattr __P((struct vop_setattr_args *ap));
|
||||
extern int union_strategy __P((struct vop_strategy_args *ap));
|
||||
extern int union_symlink __P((struct vop_symlink_args *ap));
|
||||
extern int union_unlock __P((struct vop_unlock_args *ap));
|
||||
extern int union_whiteout __P((struct vop_whiteout_args *ap));
|
||||
extern int union_write __P((struct vop_read_args *ap));
|
||||
|
||||
static void
|
||||
|
@ -65,11 +65,9 @@
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/dirent.h>
|
||||
|
||||
/* see if this is needed XXX JH
|
||||
#ifdef UNION
|
||||
#include <miscfs/union/union.h>
|
||||
#endif
|
||||
*/
|
||||
|
||||
#include <vm/vm.h>
|
||||
#include <vm/vm_param.h>
|
||||
@ -2498,9 +2496,6 @@ ogetdirentries(p, uap, retval)
|
||||
|
||||
#ifdef UNION
|
||||
{
|
||||
extern int (**union_vnodeop_p)();
|
||||
extern struct vnode *union_dircache __P((struct vnode*, struct proc*));
|
||||
|
||||
if ((SCARG(uap, count) == auio.uio_resid) &&
|
||||
(vp->v_op == union_vnodeop_p)) {
|
||||
struct vnode *lvp;
|
||||
@ -2612,9 +2607,6 @@ getdirentries(p, uap, retval)
|
||||
|
||||
#ifdef UNION
|
||||
{
|
||||
extern int (**union_vnodeop_p)();
|
||||
extern struct vnode *union_dircache __P((struct vnode*, struct proc*));
|
||||
|
||||
if ((SCARG(uap, count) == auio.uio_resid) &&
|
||||
(vp->v_op == union_vnodeop_p)) {
|
||||
struct vnode *lvp;
|
||||
|
@ -65,11 +65,9 @@
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/dirent.h>
|
||||
|
||||
/* see if this is needed XXX JH
|
||||
#ifdef UNION
|
||||
#include <miscfs/union/union.h>
|
||||
#endif
|
||||
*/
|
||||
|
||||
#include <vm/vm.h>
|
||||
#include <vm/vm_param.h>
|
||||
@ -2498,9 +2496,6 @@ ogetdirentries(p, uap, retval)
|
||||
|
||||
#ifdef UNION
|
||||
{
|
||||
extern int (**union_vnodeop_p)();
|
||||
extern struct vnode *union_dircache __P((struct vnode*, struct proc*));
|
||||
|
||||
if ((SCARG(uap, count) == auio.uio_resid) &&
|
||||
(vp->v_op == union_vnodeop_p)) {
|
||||
struct vnode *lvp;
|
||||
@ -2612,9 +2607,6 @@ getdirentries(p, uap, retval)
|
||||
|
||||
#ifdef UNION
|
||||
{
|
||||
extern int (**union_vnodeop_p)();
|
||||
extern struct vnode *union_dircache __P((struct vnode*, struct proc*));
|
||||
|
||||
if ((SCARG(uap, count) == auio.uio_resid) &&
|
||||
(vp->v_op == union_vnodeop_p)) {
|
||||
struct vnode *lvp;
|
||||
|
@ -101,6 +101,7 @@ extern int union_allocvp __P((struct vnode **, struct mount *,
|
||||
extern int union_freevp __P((struct vnode *));
|
||||
extern int union_copyfile __P((struct vnode *, struct vnode *,
|
||||
struct ucred *, struct proc *));
|
||||
extern struct vnode *union_dircache __P((struct vnode *, struct proc *));
|
||||
extern int union_copyup __P((struct union_node *, int, struct ucred *,
|
||||
struct proc *));
|
||||
extern int union_dowhiteout __P((struct union_node *, struct ucred *,
|
||||
|
@ -68,8 +68,12 @@ extern int union_init __P((void));
|
||||
static LIST_HEAD(unhead, union_node) unhead[NHASH];
|
||||
static int unvplock[NHASH];
|
||||
|
||||
static void union_dircache_r __P((struct vnode *, struct vnode ***, int *));
|
||||
static int union_list_lock __P((int ix));
|
||||
static void union_list_unlock __P((int ix));
|
||||
static int union_relookup __P((struct union_mount *, struct vnode *,
|
||||
struct vnode **, struct componentname *,
|
||||
struct componentname *, char *, int));
|
||||
extern void union_updatevp __P((struct union_node *un,
|
||||
struct vnode *uppervp,
|
||||
struct vnode *lowervp));
|
||||
|
@ -72,6 +72,7 @@ extern int union_getattr __P((struct vop_getattr_args *ap));
|
||||
extern int union_inactive __P((struct vop_inactive_args *ap));
|
||||
extern int union_ioctl __P((struct vop_ioctl_args *ap));
|
||||
extern int union_islocked __P((struct vop_islocked_args *ap));
|
||||
extern int union_lease __P((struct vop_lease_args *ap));
|
||||
extern int union_link __P((struct vop_link_args *ap));
|
||||
extern int union_lock __P((struct vop_lock_args *ap));
|
||||
extern int union_lookup __P((struct vop_lookup_args *ap));
|
||||
@ -90,6 +91,7 @@ extern int union_readlink __P((struct vop_readlink_args *ap));
|
||||
extern int union_reclaim __P((struct vop_reclaim_args *ap));
|
||||
extern int union_remove __P((struct vop_remove_args *ap));
|
||||
extern int union_rename __P((struct vop_rename_args *ap));
|
||||
extern int union_revoke __P((struct vop_revoke_args *ap));
|
||||
extern int union_rmdir __P((struct vop_rmdir_args *ap));
|
||||
extern int union_seek __P((struct vop_seek_args *ap));
|
||||
extern int union_select __P((struct vop_select_args *ap));
|
||||
@ -97,6 +99,7 @@ extern int union_setattr __P((struct vop_setattr_args *ap));
|
||||
extern int union_strategy __P((struct vop_strategy_args *ap));
|
||||
extern int union_symlink __P((struct vop_symlink_args *ap));
|
||||
extern int union_unlock __P((struct vop_unlock_args *ap));
|
||||
extern int union_whiteout __P((struct vop_whiteout_args *ap));
|
||||
extern int union_write __P((struct vop_read_args *ap));
|
||||
|
||||
static void
|
||||
|
Loading…
Reference in New Issue
Block a user