diff options
| author | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 1998-08-06 19:35:18 +0000 |
|---|---|---|
| committer | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 1998-08-06 19:35:18 +0000 |
| commit | 89fedd1a8d2624bae7d2310a83d39156079353b6 (patch) | |
| tree | 85d9d00a998016639251d59ff97e2a4df0bfa685 /sys/miscfs/kernfs | |
| parent | 67f0f9ef8777688f212974c7fd984398c1827902 (diff) | |
Rename vop_revoke, vn_bwrite, vop_noislocked, vop_nolock, vop_nounlock
to be vop_generic_revoke, vop_generic_bwrite, vop_generic_islocked,
vop_generic_lock and vop_generic_unlock.
Create vop_generic_abortop and propogate change to all file systems.
Fix PR/371.
Get rid of locking in NULLFS (should be mostly unnecessary now except for
forced unmounts).
Diffstat (limited to 'sys/miscfs/kernfs')
| -rw-r--r-- | sys/miscfs/kernfs/kernfs_vnops.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c index fb2f56a284d..5f5f7acbe6e 100644 --- a/sys/miscfs/kernfs/kernfs_vnops.c +++ b/sys/miscfs/kernfs/kernfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kernfs_vnops.c,v 1.14 1998/06/11 16:34:23 deraadt Exp $ */ +/* $OpenBSD: kernfs_vnops.c,v 1.15 1998/08/06 19:34:36 csapuntz Exp $ */ /* $NetBSD: kernfs_vnops.c,v 1.43 1996/03/16 23:52:47 christos Exp $ */ /* @@ -137,21 +137,20 @@ int kernfs_write __P((void *)); #define kernfs_remove eopnotsupp int kernfs_link __P((void *)); #define kernfs_rename eopnotsupp -#define kernfs_revoke vop_revoke +#define kernfs_revoke vop_generic_revoke #define kernfs_mkdir eopnotsupp #define kernfs_rmdir eopnotsupp int kernfs_symlink __P((void *)); int kernfs_readdir __P((void *)); #define kernfs_readlink eopnotsupp -int kernfs_abortop __P((void *)); int kernfs_inactive __P((void *)); int kernfs_reclaim __P((void *)); -#define kernfs_lock vop_nolock -#define kernfs_unlock vop_nounlock +#define kernfs_lock vop_generic_lock +#define kernfs_unlock vop_generic_unlock #define kernfs_bmap kernfs_badop #define kernfs_strategy kernfs_badop int kernfs_print __P((void *)); -#define kernfs_islocked vop_noislocked +#define kernfs_islocked vop_generic_islocked int kernfs_pathconf __P((void *)); #define kernfs_advlock eopnotsupp #define kernfs_blkatoff eopnotsupp @@ -191,7 +190,7 @@ struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = { { &vop_symlink_desc, kernfs_symlink }, /* symlink */ { &vop_readdir_desc, kernfs_readdir }, /* readdir */ { &vop_readlink_desc, kernfs_readlink },/* readlink */ - { &vop_abortop_desc, kernfs_abortop }, /* abortop */ + { &vop_abortop_desc, vop_generic_abortop }, /* abortop */ { &vop_inactive_desc, kernfs_inactive },/* inactive */ { &vop_reclaim_desc, kernfs_reclaim }, /* reclaim */ { &vop_lock_desc, kernfs_lock }, /* lock */ @@ -815,20 +814,6 @@ kernfs_symlink(v) return (EROFS); } -int -kernfs_abortop(v) - void *v; -{ - struct vop_abortop_args /* { - struct vnode *a_dvp; - struct componentname *a_cnp; - } */ *ap = v; - - if ((ap->a_cnp->cn_flags & (HASBUF | SAVESTART)) == HASBUF) - FREE(ap->a_cnp->cn_pnbuf, M_NAMEI); - return (0); -} - /* * /dev/fd "should never get here" operation */ |