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/msdosfs/msdosfs_vnops.c | |
| 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/msdosfs/msdosfs_vnops.c')
| -rw-r--r-- | sys/msdosfs/msdosfs_vnops.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index 1c97ca4bdd1..052b5ac29e9 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vnops.c,v 1.17 1998/06/09 17:56:03 deraadt Exp $ */ +/* $OpenBSD: msdosfs_vnops.c,v 1.18 1998/08/06 19:34:54 csapuntz Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */ /*- @@ -1753,20 +1753,6 @@ msdosfs_readlink(v) } int -msdosfs_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); -} - -int msdosfs_lock(v) void *v; { @@ -1998,7 +1984,7 @@ struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = { { &vop_symlink_desc, msdosfs_symlink }, /* symlink */ { &vop_readdir_desc, msdosfs_readdir }, /* readdir */ { &vop_readlink_desc, msdosfs_readlink }, /* readlink */ - { &vop_abortop_desc, msdosfs_abortop }, /* abortop */ + { &vop_abortop_desc, vop_generic_abortop }, /* abortop */ { &vop_inactive_desc, msdosfs_inactive }, /* inactive */ { &vop_reclaim_desc, msdosfs_reclaim }, /* reclaim */ { &vop_lock_desc, msdosfs_lock }, /* lock */ @@ -2011,7 +1997,7 @@ struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = { { &vop_advlock_desc, msdosfs_advlock }, /* advlock */ { &vop_reallocblks_desc, msdosfs_reallocblks }, /* reallocblks */ { &vop_update_desc, msdosfs_update }, /* update */ - { &vop_bwrite_desc, vn_bwrite }, /* bwrite */ + { &vop_bwrite_desc, vop_generic_bwrite }, /* bwrite */ { (struct vnodeop_desc *)NULL, (int (*) __P((void *)))NULL } }; struct vnodeopv_desc msdosfs_vnodeop_opv_desc = |