diff options
Diffstat (limited to 'sys/miscfs')
| -rw-r--r-- | sys/miscfs/devfs/devfs_vfsops.c | 3 | ||||
| -rw-r--r-- | sys/miscfs/fdesc/fdesc_vfsops.c | 6 | ||||
| -rw-r--r-- | sys/miscfs/kernfs/kernfs.h | 4 | ||||
| -rw-r--r-- | sys/miscfs/kernfs/kernfs_vfsops.c | 3 | ||||
| -rw-r--r-- | sys/miscfs/nullfs/null_vfsops.c | 22 | ||||
| -rw-r--r-- | sys/miscfs/portal/portal_vfsops.c | 5 | ||||
| -rw-r--r-- | sys/miscfs/procfs/procfs_vfsops.c | 5 | ||||
| -rw-r--r-- | sys/miscfs/umapfs/umap_vfsops.c | 18 | ||||
| -rw-r--r-- | sys/miscfs/union/union_vfsops.c | 19 |
9 files changed, 76 insertions, 9 deletions
diff --git a/sys/miscfs/devfs/devfs_vfsops.c b/sys/miscfs/devfs/devfs_vfsops.c index 1660af5..199ed5e 100644 --- a/sys/miscfs/devfs/devfs_vfsops.c +++ b/sys/miscfs/devfs/devfs_vfsops.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: devfs/devfs_vfsops.c,v 1.25 1997/10/16 08:18:38 julian Exp $ + * $Id: devfs_vfsops.c,v 1.26 1998/01/02 07:31:06 julian Exp $ * */ @@ -341,6 +341,7 @@ static struct vfsops devfs_vfsops = { devfs_statfs, devfs_sync, devfs_vget, + vfs_vrele, devfs_fhtovp, devfs_vptofh, devfs_init diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c index b57b236..b5fe219 100644 --- a/sys/miscfs/fdesc/fdesc_vfsops.c +++ b/sys/miscfs/fdesc/fdesc_vfsops.c @@ -35,7 +35,7 @@ * * @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94 * - * $Id: fdesc_vfsops.c,v 1.12 1997/08/16 19:15:12 wollman Exp $ + * $Id: fdesc_vfsops.c,v 1.13 1997/10/12 20:24:39 phk Exp $ */ /* @@ -71,6 +71,7 @@ static int fdesc_sync __P((struct mount *mp, int waitfor, struct ucred *cred, struct proc *p)); static int fdesc_vget __P((struct mount *mp, ino_t ino, struct vnode **vpp)); +static int fdesc_vrele __P((struct mount *mp, struct vnode *vp)); static int fdesc_vptofh __P((struct vnode *vp, struct fid *fhp)); /* @@ -253,6 +254,8 @@ fdesc_sync(mp, waitfor, cred, p) size_t, struct proc *)))eopnotsupp) #define fdesc_vget ((int (*) __P((struct mount *, ino_t, struct vnode **))) \ eopnotsupp) +#define fdesc_vrele ((int (*) __P((struct mount *, struct vnode *))) \ + eopnotsupp) #define fdesc_vptofh ((int (*) __P((struct vnode *, struct fid *)))eopnotsupp) static struct vfsops fdesc_vfsops = { @@ -264,6 +267,7 @@ static struct vfsops fdesc_vfsops = { fdesc_statfs, fdesc_sync, fdesc_vget, + fdesc_vrele, fdesc_fhtovp, fdesc_vptofh, fdesc_init, diff --git a/sys/miscfs/kernfs/kernfs.h b/sys/miscfs/kernfs/kernfs.h index 1488bc6..e13c299 100644 --- a/sys/miscfs/kernfs/kernfs.h +++ b/sys/miscfs/kernfs/kernfs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kernfs.h 8.6 (Berkeley) 3/29/95 - * $Id: kernfs.h,v 1.7 1997/08/16 19:15:14 wollman Exp $ + * $Id: kernfs.h,v 1.8 1997/09/07 05:25:58 bde Exp $ */ #define _PATH_KERNFS "/kern" /* Default mountpoint */ @@ -61,6 +61,8 @@ struct kernfs_node { size_t, struct proc *)))eopnotsupp) #define kernfs_vget ((int (*) __P((struct mount *, ino_t, struct vnode **))) \ eopnotsupp) +#define kernfs_vrele ((int (*) __P((struct mount *, struct vnode *))) \ + eopnotsupp) #define kernfs_vptofh ((int (*) __P((struct vnode *, struct fid *)))eopnotsupp) extern vop_t **kernfs_vnodeop_p; extern dev_t rrootdev; diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c index 897e9b0..47b7e5c 100644 --- a/sys/miscfs/kernfs/kernfs_vfsops.c +++ b/sys/miscfs/kernfs/kernfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kernfs_vfsops.c 8.10 (Berkeley) 5/14/95 - * $Id: kernfs_vfsops.c,v 1.19 1997/08/02 14:32:02 bde Exp $ + * $Id: kernfs_vfsops.c,v 1.20 1997/10/12 20:24:48 phk Exp $ */ /* @@ -278,6 +278,7 @@ static struct vfsops kernfs_vfsops = { kernfs_statfs, kernfs_sync, kernfs_vget, + kernfs_vrele, kernfs_fhtovp, kernfs_vptofh, kernfs_init, diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c index 30515a5..961c0f9 100644 --- a/sys/miscfs/nullfs/null_vfsops.c +++ b/sys/miscfs/nullfs/null_vfsops.c @@ -36,7 +36,7 @@ * @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94 * * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92 - * $Id: null_vfsops.c,v 1.23 1998/02/04 22:32:47 eivind Exp $ + * $Id: null_vfsops.c,v 1.24 1998/02/06 12:13:40 eivind Exp $ */ /* @@ -75,6 +75,7 @@ static int nullfs_unmount __P((struct mount *mp, int mntflags, struct proc *p)); static int nullfs_vget __P((struct mount *mp, ino_t ino, struct vnode **vpp)); +static int nullfs_vrele __P((struct mount *mp, struct vnode *vp)); static int nullfs_vptofh __P((struct vnode *vp, struct fid *fhp)); /* @@ -388,6 +389,24 @@ nullfs_vget(mp, ino, vpp) return VFS_VGET(MOUNTTONULLMOUNT(mp)->nullm_vfs, ino, vpp); } +/* + * Complement to all vpp returning ops. + * XXX - initially only to get rid of WILLRELE. + */ +/* ARGSUSED */ +static int +nullfs_vrele(mp, vp) + struct mount *mp; + struct vnode *vp; +{ + int error = 0; + + error = VFS_VRELE(MOUNTTONULLMOUNT(mp)->nullm_vfs, + NULLVPTOLOWERVP(vp)); + vrele(vp); + return (error); +} + static int nullfs_fhtovp(mp, fidp, nam, vpp, exflagsp, credanonp) struct mount *mp; @@ -419,6 +438,7 @@ static struct vfsops null_vfsops = { nullfs_statfs, nullfs_sync, nullfs_vget, + nullfs_vrele, nullfs_fhtovp, nullfs_vptofh, nullfs_init, diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c index 481b4d4..2fa81a9 100644 --- a/sys/miscfs/portal/portal_vfsops.c +++ b/sys/miscfs/portal/portal_vfsops.c @@ -35,7 +35,7 @@ * * @(#)portal_vfsops.c 8.11 (Berkeley) 5/14/95 * - * $Id: portal_vfsops.c,v 1.18 1997/10/12 20:24:53 phk Exp $ + * $Id: portal_vfsops.c,v 1.19 1998/01/01 08:28:11 bde Exp $ */ /* @@ -273,6 +273,8 @@ portal_statfs(mp, sbp, p) size_t, struct proc *)))eopnotsupp) #define portal_vget ((int (*) __P((struct mount *, ino_t, struct vnode **))) \ eopnotsupp) +#define portal_vrele ((int (*) __P((struct mount *, struct vnode *))) \ + eopnotsupp) #define portal_vptofh ((int (*) __P((struct vnode *, struct fid *)))eopnotsupp) static struct vfsops portal_vfsops = { @@ -284,6 +286,7 @@ static struct vfsops portal_vfsops = { portal_statfs, portal_sync, portal_vget, + portal_vrele, portal_fhtovp, portal_vptofh, portal_init, diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c index 9379da6..fddc277 100644 --- a/sys/miscfs/procfs/procfs_vfsops.c +++ b/sys/miscfs/procfs/procfs_vfsops.c @@ -36,7 +36,7 @@ * * @(#)procfs_vfsops.c 8.7 (Berkeley) 5/10/95 * - * $Id: procfs_vfsops.c,v 1.18 1997/12/08 01:06:24 sef Exp $ + * $Id: procfs_vfsops.c,v 1.19 1997/12/30 08:46:44 bde Exp $ */ /* @@ -193,6 +193,8 @@ procfs_init(vfsp) size_t, struct proc *)))eopnotsupp) #define procfs_vget ((int (*) __P((struct mount *, ino_t, struct vnode **))) \ eopnotsupp) +#define procfs_vrele ((int (*) __P((struct mount *, struct vnode *))) \ + eopnotsupp) #define procfs_vptofh ((int (*) __P((struct vnode *, struct fid *)))einval) static struct vfsops procfs_vfsops = { @@ -204,6 +206,7 @@ static struct vfsops procfs_vfsops = { procfs_statfs, procfs_sync, procfs_vget, + procfs_vrele, procfs_fhtovp, procfs_vptofh, procfs_init, diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c index d9dce5c..8c1b705 100644 --- a/sys/miscfs/umapfs/umap_vfsops.c +++ b/sys/miscfs/umapfs/umap_vfsops.c @@ -35,7 +35,7 @@ * * @(#)umap_vfsops.c 8.8 (Berkeley) 5/14/95 * - * $Id: umap_vfsops.c,v 1.19 1998/02/03 14:30:01 kato Exp $ + * $Id: umap_vfsops.c,v 1.20 1998/02/07 01:34:32 kato Exp $ */ /* @@ -72,6 +72,7 @@ static int umapfs_unmount __P((struct mount *mp, int mntflags, struct proc *p)); static int umapfs_vget __P((struct mount *mp, ino_t ino, struct vnode **vpp)); +static int umapfs_vrele __P((struct mount *mp, struct vnode *vp)); static int umapfs_vptofh __P((struct vnode *vp, struct fid *fhp)); /* @@ -393,6 +394,20 @@ umapfs_vget(mp, ino, vpp) return (VFS_VGET(MOUNTTOUMAPMOUNT(mp)->umapm_vfs, ino, vpp)); } +/* + * Complement to all vpp returning ops. + * XXX - initially only to get rid of WILLRELE. + */ +/* ARGSUSED */ +static int +umapfs_vrele(mp, vp) + struct mount *mp; + struct vnode *vp; +{ + vrele(vp); + return (0); +} + static int umapfs_fhtovp(mp, fidp, nam, vpp, exflagsp, credanonp) struct mount *mp; @@ -423,6 +438,7 @@ static struct vfsops umap_vfsops = { umapfs_statfs, umapfs_sync, umapfs_vget, + umapfs_vrele, umapfs_fhtovp, umapfs_vptofh, umapfs_init, diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c index 78dc7f4..156108d 100644 --- a/sys/miscfs/union/union_vfsops.c +++ b/sys/miscfs/union/union_vfsops.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95 - * $Id: union_vfsops.c,v 1.25 1998/02/06 12:13:44 eivind Exp $ + * $Id: union_vfsops.c,v 1.26 1998/02/10 08:04:31 kato Exp $ */ /* @@ -74,6 +74,7 @@ static int union_unmount __P((struct mount *mp, int mntflags, struct proc *p)); extern int union_vget __P((struct mount *mp, ino_t ino, struct vnode **vpp)); +static int union_vrele __P((struct mount *mp, struct vnode *vp)); extern int union_vptofh __P((struct vnode *vp, struct fid *fhp)); /* @@ -523,6 +524,21 @@ union_statfs(mp, sbp, p) } /* + * Complement to all vpp returning ops. + * XXX - initially only to get rid of WILLRELE. + * XXX - may change when modification of vops start. + */ +/* ARGSUSED */ +static int +union_vrele(mp, vp) + struct mount *mp; + struct vnode *vp; +{ + vrele(vp); + return (0); +} + +/* * XXX - Assumes no data cached at union layer. */ #define union_sync ((int (*) __P((struct mount *, int, struct ucred *, \ @@ -547,6 +563,7 @@ static struct vfsops union_vfsops = { union_statfs, union_sync, union_vget, + union_vrele, union_fhtovp, union_vptofh, union_init, |
