diff options
author | msmith <msmith@FreeBSD.org> | 1998-03-01 22:46:53 +0000 |
---|---|---|
committer | msmith <msmith@FreeBSD.org> | 1998-03-01 22:46:53 +0000 |
commit | 950d32131bcda63f4d849362c64123e28600ae2c (patch) | |
tree | 20dcb6f46f936b41e0a16f253d5a11772bfbfd92 /sys/fs | |
parent | 611da89e2cf7f2301c19b2e6115e9668d92f3d69 (diff) | |
download | FreeBSD-src-950d32131bcda63f4d849362c64123e28600ae2c.zip FreeBSD-src-950d32131bcda63f4d849362c64123e28600ae2c.tar.gz |
The intent is to get rid of WILLRELE in vnode_if.src by making
a complement to all ops that return a vpp, VFS_VRELE. This is
initially only for file systems that implement the following ops
that do a WILLRELE:
vop_create, vop_whiteout, vop_mknod, vop_remove, vop_link,
vop_rename, vop_mkdir, vop_rmdir, vop_symlink
This is initial DNA that doesn't do anything yet. VFS_VRELE is
implemented but not called.
A default vfs_vrele was created for fs implementations that use the
standard vnode management routines.
VFS_VRELE implementations were made for the following file systems:
Standard (vfs_vrele)
ffs mfs nfs msdosfs devfs ext2fs
Custom
union umapfs
Just EOPNOTSUPP
fdesc procfs kernfs portal cd9660
These implementations may change as VOP changes are implemented.
In the next phase, in the vop implementations calls to vrele and the vrele
part of vput will be moved to the top layer vfs_vnops and made visible
to all layers. vput will be replaced by unlock in these cases. Unlocking
will still be done in the per fs layer but the refcount decrement will be
triggered at the top because it doesn't hurt to hold a vnode reference a
little longer. This will have minimal impact on the structure of the
existing code.
This will only be done for vnode arguments that are released by the various
fs vop implementations.
Wider use of VFS_VRELE will likely require restructuring of the code.
Reviewed by: phk, dyson, terry et. al.
Submitted by: Michael Hancock <michaelh@cet.co.jp>
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/cd9660/cd9660_vfsops.c | 17 | ||||
-rw-r--r-- | sys/fs/fdescfs/fdesc_vfsops.c | 6 | ||||
-rw-r--r-- | sys/fs/msdosfs/msdosfs_vfsops.c | 3 | ||||
-rw-r--r-- | sys/fs/nullfs/null_vfsops.c | 22 | ||||
-rw-r--r-- | sys/fs/portalfs/portal_vfsops.c | 5 | ||||
-rw-r--r-- | sys/fs/procfs/procfs_vfsops.c | 5 | ||||
-rw-r--r-- | sys/fs/umapfs/umap_vfsops.c | 18 | ||||
-rw-r--r-- | sys/fs/unionfs/union_vfsops.c | 19 |
8 files changed, 87 insertions, 8 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 583d66c..a9218c3 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 - * $Id: cd9660_vfsops.c,v 1.32 1997/11/07 08:52:51 phk Exp $ + * $Id: cd9660_vfsops.c,v 1.33 1997/12/21 21:40:02 joerg Exp $ */ #include <sys/param.h> @@ -73,6 +73,7 @@ static int cd9660_statfs __P((struct mount *, struct statfs *, struct proc *)); static int cd9660_sync __P((struct mount *, int, struct ucred *, struct proc *)); static int cd9660_vget __P((struct mount *, ino_t, struct vnode **)); +static int cd9660_vrele __P((struct mount *, struct vnode *)); static int cd9660_fhtovp __P((struct mount *, struct fid *, struct sockaddr *, struct vnode **, int *, struct ucred **)); static int cd9660_vptofh __P((struct vnode *, struct fid *)); @@ -86,6 +87,7 @@ static struct vfsops cd9660_vfsops = { cd9660_statfs, cd9660_sync, cd9660_vget, + cd9660_vrele, cd9660_fhtovp, cd9660_vptofh, cd9660_init @@ -658,6 +660,19 @@ cd9660_vget(mp, ino, vpp) (struct iso_directory_record *)0)); } +/* + * Complement to all vpp returning ops. + * XXX - initially only to get rid of WILLRELE. + */ +/* ARGSUSED */ +static int +cd9660_vrele(mp, vp) + struct mount *mp; + struct vnode *vp; +{ + return (EOPNOTSUPP); +} + int cd9660_vget_internal(mp, ino, vpp, relocated, isodir) struct mount *mp; diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c index b57b236..b5fe219 100644 --- a/sys/fs/fdescfs/fdesc_vfsops.c +++ b/sys/fs/fdescfs/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/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index ec4e5f1..2b1d1d7 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vfsops.c,v 1.27 1998/02/23 14:57:50 kato Exp $ */ +/* $Id: msdosfs_vfsops.c,v 1.28 1998/02/23 16:44:32 ache Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -1042,6 +1042,7 @@ static struct vfsops msdosfs_vfsops = { msdosfs_statfs, msdosfs_sync, msdosfs_vget, + vfs_vrele, msdosfs_fhtovp, msdosfs_vptofh, msdosfs_init diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 30515a5..961c0f9 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/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/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c index 481b4d4..2fa81a9 100644 --- a/sys/fs/portalfs/portal_vfsops.c +++ b/sys/fs/portalfs/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/fs/procfs/procfs_vfsops.c b/sys/fs/procfs/procfs_vfsops.c index 9379da6..fddc277 100644 --- a/sys/fs/procfs/procfs_vfsops.c +++ b/sys/fs/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/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c index d9dce5c..8c1b705 100644 --- a/sys/fs/umapfs/umap_vfsops.c +++ b/sys/fs/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/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index 78dc7f4..156108d 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/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, |