summaryrefslogtreecommitdiff
path: root/sys/miscfs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/miscfs')
-rw-r--r--sys/miscfs/fdesc/fdesc_vfsops.c14
-rw-r--r--sys/miscfs/kernfs/kernfs.h6
-rw-r--r--sys/miscfs/kernfs/kernfs_vfsops.c5
-rw-r--r--sys/miscfs/nullfs/null_vfsops.c16
-rw-r--r--sys/miscfs/portal/portal_vfsops.c9
-rw-r--r--sys/miscfs/procfs/procfs_vfsops.c9
-rw-r--r--sys/miscfs/umapfs/umap_vfsops.c18
-rw-r--r--sys/miscfs/union/union_vfsops.c9
8 files changed, 49 insertions, 37 deletions
diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c
index 7a171afddee..a919fe2cb4a 100644
--- a/sys/miscfs/fdesc/fdesc_vfsops.c
+++ b/sys/miscfs/fdesc/fdesc_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fdesc_vfsops.c,v 1.7 1999/05/31 17:34:49 millert Exp $ */
+/* $OpenBSD: fdesc_vfsops.c,v 1.8 2000/02/07 04:57:16 assar Exp $ */
/* $NetBSD: fdesc_vfsops.c,v 1.21 1996/02/09 22:40:07 christos Exp $ */
/*
@@ -68,8 +68,7 @@ int fdesc_quotactl __P((struct mount *, int, uid_t, caddr_t,
int fdesc_statfs __P((struct mount *, struct statfs *, struct proc *));
int fdesc_sync __P((struct mount *, int, struct ucred *, struct proc *));
int fdesc_vget __P((struct mount *, ino_t, struct vnode **));
-int fdesc_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
- struct vnode **, int *, struct ucred **));
+int fdesc_fhtovp __P((struct mount *, struct fid *, struct vnode **));
int fdesc_vptofh __P((struct vnode *, struct fid *));
/*
@@ -242,7 +241,7 @@ fdesc_sync(mp, waitfor, uc, p)
}
#define fdesc_fhtovp ((int (*) __P((struct mount *, struct fid *, \
- struct mbuf *, struct vnode **, int *, struct ucred **)))eopnotsupp)
+ struct vnode **)))eopnotsupp)
#define fdesc_quotactl ((int (*) __P((struct mount *, int, uid_t, caddr_t, \
struct proc *)))eopnotsupp)
#define fdesc_sysctl ((int (*) __P((int *, u_int, void *, size_t *, void *, \
@@ -251,6 +250,9 @@ fdesc_sync(mp, waitfor, uc, p)
eopnotsupp)
#define fdesc_vptofh ((int (*) __P((struct vnode *, struct fid *)))eopnotsupp)
+#define fdesc_checkexp ((int (*) __P((struct mount *, struct mbuf *, \
+ int *, struct ucred **)))eopnotsupp)
+
struct vfsops fdesc_vfsops = {
fdesc_mount,
fdesc_start,
@@ -263,6 +265,6 @@ struct vfsops fdesc_vfsops = {
fdesc_fhtovp,
fdesc_vptofh,
fdesc_init,
- fdesc_sysctl
+ fdesc_sysctl,
+ fdesc_checkexp
};
-
diff --git a/sys/miscfs/kernfs/kernfs.h b/sys/miscfs/kernfs/kernfs.h
index e75573e12d5..9b720db8aee 100644
--- a/sys/miscfs/kernfs/kernfs.h
+++ b/sys/miscfs/kernfs/kernfs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kernfs.h,v 1.7 1998/12/28 05:51:38 millert Exp $ */
+/* $OpenBSD: kernfs.h,v 1.8 2000/02/07 04:57:16 assar Exp $ */
/* $NetBSD: kernfs.h,v 1.10 1996/02/09 22:40:21 christos Exp $ */
/*
@@ -78,7 +78,7 @@ struct kernfs_node {
#define VTOKERN(vp) ((struct kernfs_node *)(vp)->v_data)
#define kernfs_fhtovp ((int (*) __P((struct mount *, struct fid *, \
- struct mbuf *, struct vnode **, int *, struct ucred **)))eopnotsupp)
+ struct vnode **)))eopnotsupp)
#define kernfs_quotactl ((int (*) __P((struct mount *, int, uid_t, caddr_t, \
struct proc *)))eopnotsupp)
#define kernfs_sysctl ((int (*) __P((int *, u_int, void *, size_t *, void *, \
@@ -88,6 +88,8 @@ struct kernfs_node {
#define kernfs_vptofh ((int (*) __P((struct vnode *, struct fid *)))eopnotsupp)
#define kernfs_sync ((int (*) __P((struct mount *, int, struct ucred *, \
struct proc *)))nullop)
+#define kernfs_checkexp ((int (*) __P((struct mount *, struct mbuf *, \
+ int *, struct ucred **)))eopnotsupp)
extern int (**kernfs_vnodeop_p) __P((void *));
extern struct vfsops kernfs_vfsops;
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index 87d26d9813f..6693d43f09b 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kernfs_vfsops.c,v 1.12 1999/05/31 17:34:49 millert Exp $ */
+/* $OpenBSD: kernfs_vfsops.c,v 1.13 2000/02/07 04:57:16 assar Exp $ */
/* $NetBSD: kernfs_vfsops.c,v 1.26 1996/04/22 01:42:27 christos Exp $ */
/*
@@ -285,5 +285,6 @@ struct vfsops kernfs_vfsops = {
kernfs_fhtovp,
kernfs_vptofh,
kernfs_init,
- kernfs_sysctl
+ kernfs_sysctl,
+ kernfs_checkexp
};
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index f59d83c1d37..4c51b51a4b0 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/nullfs/null_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: null_vfsops.c,v 1.10 1999/05/31 17:34:49 millert Exp $ */
+/* $OpenBSD: null_vfsops.c,v 1.11 2000/02/07 04:57:16 assar Exp $ */
/* $NetBSD: null_vfsops.c,v 1.11 1996/05/10 22:50:56 jtk Exp $ */
/*
@@ -67,8 +67,7 @@ int nullfs_quotactl __P((struct mount *, int, uid_t, caddr_t,
int nullfs_statfs __P((struct mount *, struct statfs *, struct proc *));
int nullfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
int nullfs_vget __P((struct mount *, ino_t, struct vnode **));
-int nullfs_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
- struct vnode **, int *, struct ucred **));
+int nullfs_fhtovp __P((struct mount *, struct fid *, struct vnode **));
int nullfs_vptofh __P((struct vnode *, struct fid *));
/*
* Mount null layer
@@ -351,13 +350,10 @@ nullfs_vget(mp, ino, vpp)
}
int
-nullfs_fhtovp(mp, fidp, nam, vpp, exflagsp, credanonp)
+nullfs_fhtovp(mp, fidp, vpp)
struct mount *mp;
struct fid *fidp;
- struct mbuf *nam;
struct vnode **vpp;
- int *exflagsp;
- struct ucred**credanonp;
{
return (EOPNOTSUPP);
@@ -375,6 +371,9 @@ nullfs_vptofh(vp, fhp)
#define nullfs_sysctl ((int (*) __P((int *, u_int, void *, size_t *, void *, \
size_t, struct proc *)))eopnotsupp)
+#define nullfs_checkexp ((int (*) __P((struct mount *, struct mbuf *, \
+ int *, struct ucred **)))eopnotsupp)
+
struct vfsops null_vfsops = {
nullfs_mount,
nullfs_start,
@@ -387,5 +386,6 @@ struct vfsops null_vfsops = {
nullfs_fhtovp,
nullfs_vptofh,
nullfs_init,
- nullfs_sysctl
+ nullfs_sysctl,
+ nullfs_checkexp
};
diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index b2eb51f50dd..2211aa0e903 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: portal_vfsops.c,v 1.7 1999/05/31 17:34:50 millert Exp $ */
+/* $OpenBSD: portal_vfsops.c,v 1.8 2000/02/07 04:57:16 assar Exp $ */
/* $NetBSD: portal_vfsops.c,v 1.14 1996/02/09 22:40:41 christos Exp $ */
/*
@@ -247,7 +247,7 @@ portal_statfs(mp, sbp, p)
struct proc *)))nullop)
#define portal_fhtovp ((int (*) __P((struct mount *, struct fid *, \
- struct mbuf *, struct vnode **, int *, struct ucred **)))eopnotsupp)
+ struct vnode **)))eopnotsupp)
#define portal_quotactl ((int (*) __P((struct mount *, int, uid_t, caddr_t, \
struct proc *)))eopnotsupp)
#define portal_sysctl ((int (*) __P((int *, u_int, void *, size_t *, void *, \
@@ -255,6 +255,8 @@ portal_statfs(mp, sbp, p)
#define portal_vget ((int (*) __P((struct mount *, ino_t, struct vnode **))) \
eopnotsupp)
#define portal_vptofh ((int (*) __P((struct vnode *, struct fid *)))eopnotsupp)
+#define portal_checkexp ((int (*) __P((struct mount *, struct mbuf *, \
+ int *, struct ucred **)))eopnotsupp)
struct vfsops portal_vfsops = {
portal_mount,
@@ -268,5 +270,6 @@ struct vfsops portal_vfsops = {
portal_fhtovp,
portal_vptofh,
portal_init,
- portal_sysctl
+ portal_sysctl,
+ portal_checkexp
};
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index 618007642f6..5e997b87abf 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: procfs_vfsops.c,v 1.10 1999/05/31 17:34:50 millert Exp $ */
+/* $OpenBSD: procfs_vfsops.c,v 1.11 2000/02/07 04:57:16 assar Exp $ */
/* $NetBSD: procfs_vfsops.c,v 1.25 1996/02/09 22:40:53 christos Exp $ */
/*
@@ -184,7 +184,7 @@ procfs_statfs(mp, sbp, p)
struct proc *)))nullop)
#define procfs_fhtovp ((int (*) __P((struct mount *, struct fid *, \
- struct mbuf *, struct vnode **, int *, struct ucred **)))eopnotsupp)
+ struct vnode **)))eopnotsupp)
#define procfs_quotactl ((int (*) __P((struct mount *, int, uid_t, caddr_t, \
struct proc *)))eopnotsupp)
#define procfs_sysctl ((int (*) __P((int *, u_int, void *, size_t *, void *, \
@@ -192,6 +192,8 @@ procfs_statfs(mp, sbp, p)
#define procfs_vget ((int (*) __P((struct mount *, ino_t, struct vnode **))) \
eopnotsupp)
#define procfs_vptofh ((int (*) __P((struct vnode *, struct fid *)))eopnotsupp)
+#define procfs_checkexp ((int (*) __P((struct mount *, struct mbuf *, \
+ int *, struct ucred **)))eopnotsupp)
struct vfsops procfs_vfsops = {
procfs_mount,
@@ -205,5 +207,6 @@ struct vfsops procfs_vfsops = {
procfs_fhtovp,
procfs_vptofh,
procfs_init,
- procfs_sysctl
+ procfs_sysctl,
+ procfs_checkexp
};
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index d2409287f88..bcbeed4a249 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/umapfs/umap_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umap_vfsops.c,v 1.14 1999/05/31 17:34:50 millert Exp $ */
+/* $OpenBSD: umap_vfsops.c,v 1.15 2000/02/07 04:57:17 assar Exp $ */
/* $NetBSD: umap_vfsops.c,v 1.9 1996/02/09 22:41:05 christos Exp $ */
/*
@@ -66,8 +66,7 @@ int umapfs_quotactl __P((struct mount *, int, uid_t, caddr_t,
int umapfs_statfs __P((struct mount *, struct statfs *, struct proc *));
int umapfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
int umapfs_vget __P((struct mount *, ino_t, struct vnode **));
-int umapfs_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
- struct vnode **, int *, struct ucred **));
+int umapfs_fhtovp __P((struct mount *, struct fid *, struct vnode **));
int umapfs_vptofh __P((struct vnode *, struct fid *));
/*
@@ -391,15 +390,12 @@ umapfs_vget(mp, ino, vpp)
}
int
-umapfs_fhtovp(mp, fidp, nam, vpp, exflagsp, credanonp)
+umapfs_fhtovp(mp, fidp, vpp)
struct mount *mp;
struct fid *fidp;
- struct mbuf *nam;
struct vnode **vpp;
- int *exflagsp;
- struct ucred**credanonp;
{
- return VFS_FHTOVP(MOUNTTOUMAPMOUNT(mp)->umapm_vfs, fidp, nam, vpp, exflagsp, credanonp);
+ return VFS_FHTOVP(MOUNTTOUMAPMOUNT(mp)->umapm_vfs, fidp, vpp);
}
int
@@ -412,7 +408,8 @@ umapfs_vptofh(vp, fhp)
#define umapfs_sysctl ((int (*) __P((int *, u_int, void *, size_t *, void *, \
size_t, struct proc *)))eopnotsupp)
-
+#define umapfs_checkexp ((int (*) __P((struct mount *, struct mbuf *, \
+ int *, struct ucred **)))eopnotsupp)
struct vfsops umap_vfsops = {
umapfs_mount,
@@ -426,5 +423,6 @@ struct vfsops umap_vfsops = {
umapfs_fhtovp,
umapfs_vptofh,
umapfs_init,
- umapfs_sysctl
+ umapfs_sysctl,
+ umapfs_checkexp
};
diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index 3b0743343d8..fd155de5eb7 100644
--- a/sys/miscfs/union/union_vfsops.c
+++ b/sys/miscfs/union/union_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: union_vfsops.c,v 1.9 1999/05/31 17:34:50 millert Exp $ */
+/* $OpenBSD: union_vfsops.c,v 1.10 2000/02/07 04:57:17 assar Exp $ */
/* $NetBSD: union_vfsops.c,v 1.10 1995/06/18 14:47:47 cgd Exp $ */
/*
@@ -480,7 +480,7 @@ union_statfs(mp, sbp, p)
struct proc *)))nullop)
#define union_fhtovp ((int (*) __P((struct mount *, struct fid *, \
- struct mbuf *, struct vnode **, int *, struct ucred **)))eopnotsupp)
+ struct vnode **)))eopnotsupp)
#define union_quotactl ((int (*) __P((struct mount *, int, uid_t, caddr_t, \
struct proc *)))eopnotsupp)
#define union_sysctl ((int (*) __P((int *, u_int, void *, size_t *, void *, \
@@ -488,6 +488,8 @@ union_statfs(mp, sbp, p)
#define union_vget ((int (*) __P((struct mount *, ino_t, struct vnode **))) \
eopnotsupp)
#define union_vptofh ((int (*) __P((struct vnode *, struct fid *)))eopnotsupp)
+#define union_checkexp ((int (*) __P((struct mount *, struct mbuf *, \
+ int *, struct ucred **)))eopnotsupp)
struct vfsops union_vfsops = {
union_mount,
@@ -501,5 +503,6 @@ struct vfsops union_vfsops = {
union_fhtovp,
union_vptofh,
union_init,
- union_sysctl
+ union_sysctl,
+ union_checkexp
};