diff options
Diffstat (limited to 'sys/ufs/mfs')
| -rw-r--r-- | sys/ufs/mfs/mfs_extern.h | 4 | ||||
| -rw-r--r-- | sys/ufs/mfs/mfs_vnops.c | 39 | ||||
| -rw-r--r-- | sys/ufs/mfs/mfsnode.h | 35 |
3 files changed, 7 insertions, 71 deletions
diff --git a/sys/ufs/mfs/mfs_extern.h b/sys/ufs/mfs/mfs_extern.h index 6b3dc8b..465e434 100644 --- a/sys/ufs/mfs/mfs_extern.h +++ b/sys/ufs/mfs/mfs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_extern.h 8.4 (Berkeley) 3/30/95 - * $Id$ + * $Id: mfs_extern.h,v 1.9 1997/02/22 09:47:31 peter Exp $ */ #ifndef _UFS_MFS_MFS_EXTERN_H_ @@ -44,6 +44,4 @@ void mfs_doio __P((struct buf *bp, caddr_t base)); int mfs_mountfs __P((struct vnode *, struct mount *, struct proc *)); int mfs_mountroot __P((void)); -#define mfs_revoke vop_revoke - #endif /* !_UFS_MFS_MFS_EXTERN_H_ */ diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c index ce18df5..0c552bd 100644 --- a/sys/ufs/mfs/mfs_vnops.c +++ b/sys/ufs/mfs/mfs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_vnops.c 8.11 (Berkeley) 5/22/95 - * $Id: mfs_vnops.c,v 1.23 1997/10/15 10:05:29 phk Exp $ + * $Id: mfs_vnops.c,v 1.24 1997/10/15 13:23:57 phk Exp $ */ #include <sys/param.h> @@ -66,48 +66,19 @@ static int mfs_strategy __P((struct vop_strategy_args *)); /* XXX */ */ vop_t **mfs_vnodeop_p; static struct vnodeopv_entry_desc mfs_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *) vn_default_error }, - { &vop_abortop_desc, (vop_t *) mfs_abortop }, - { &vop_access_desc, (vop_t *) mfs_access }, - { &vop_advlock_desc, (vop_t *) mfs_advlock }, - { &vop_blkatoff_desc, (vop_t *) mfs_blkatoff }, + { &vop_default_desc, (vop_t *) mfs_badop }, { &vop_bmap_desc, (vop_t *) mfs_bmap }, - { &vop_bwrite_desc, (vop_t *) mfs_bwrite }, { &vop_close_desc, (vop_t *) mfs_close }, - { &vop_create_desc, (vop_t *) mfs_create }, { &vop_fsync_desc, (vop_t *) mfs_fsync }, - { &vop_getattr_desc, (vop_t *) mfs_getattr }, { &vop_inactive_desc, (vop_t *) mfs_inactive }, { &vop_ioctl_desc, (vop_t *) mfs_ioctl }, - { &vop_islocked_desc, (vop_t *) mfs_islocked }, - { &vop_link_desc, (vop_t *) mfs_link }, - { &vop_lock_desc, (vop_t *) mfs_lock }, - { &vop_lookup_desc, (vop_t *) mfs_lookup }, - { &vop_mkdir_desc, (vop_t *) mfs_mkdir }, - { &vop_mknod_desc, (vop_t *) mfs_mknod }, - { &vop_mmap_desc, (vop_t *) mfs_mmap }, + { &vop_islocked_desc, (vop_t *) vop_noislocked }, + { &vop_lock_desc, (vop_t *) vop_nolock }, { &vop_open_desc, (vop_t *) mfs_open }, - { &vop_pathconf_desc, (vop_t *) mfs_pathconf }, - { &vop_poll_desc, (vop_t *) mfs_poll }, { &vop_print_desc, (vop_t *) mfs_print }, - { &vop_read_desc, (vop_t *) mfs_read }, - { &vop_readdir_desc, (vop_t *) mfs_readdir }, - { &vop_readlink_desc, (vop_t *) mfs_readlink }, { &vop_reclaim_desc, (vop_t *) ufs_reclaim }, - { &vop_remove_desc, (vop_t *) mfs_remove }, - { &vop_rename_desc, (vop_t *) mfs_rename }, - { &vop_revoke_desc, (vop_t *) mfs_revoke }, - { &vop_rmdir_desc, (vop_t *) mfs_rmdir }, - { &vop_seek_desc, (vop_t *) mfs_seek }, - { &vop_setattr_desc, (vop_t *) mfs_setattr }, { &vop_strategy_desc, (vop_t *) mfs_strategy }, - { &vop_symlink_desc, (vop_t *) mfs_symlink }, - { &vop_truncate_desc, (vop_t *) mfs_truncate }, - { &vop_unlock_desc, (vop_t *) mfs_unlock }, - { &vop_update_desc, (vop_t *) mfs_update }, - { &vop_valloc_desc, (vop_t *) mfs_valloc }, - { &vop_vfree_desc, (vop_t *) mfs_vfree }, - { &vop_write_desc, (vop_t *) mfs_write }, + { &vop_unlock_desc, (vop_t *) vop_nounlock }, { NULL, NULL } }; static struct vnodeopv_desc mfs_vnodeop_opv_desc = diff --git a/sys/ufs/mfs/mfsnode.h b/sys/ufs/mfs/mfsnode.h index 53fe40a..34b7b6b 100644 --- a/sys/ufs/mfs/mfsnode.h +++ b/sys/ufs/mfs/mfsnode.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfsnode.h 8.3 (Berkeley) 5/19/95 - * $Id: mfsnode.h,v 1.8 1997/02/22 09:47:34 peter Exp $ + * $Id: mfsnode.h,v 1.9 1997/09/14 02:58:08 peter Exp $ */ #ifndef _UFS_MFS_MFSNODE_H_ @@ -57,37 +57,4 @@ struct mfsnode { #define VTOMFS(vp) ((struct mfsnode *)(vp)->v_data) #define MFSTOV(mfsp) ((mfsp)->mfs_vnode) -/* Prototypes for MFS operations on vnodes. */ -#define mfs_lookup ((int (*) __P((struct vop_lookup_args *)))mfs_badop) -#define mfs_create ((int (*) __P((struct vop_create_args *)))mfs_badop) -#define mfs_mknod ((int (*) __P((struct vop_mknod_args *)))mfs_badop) -#define mfs_access ((int (*) __P((struct vop_access_args *)))mfs_badop) -#define mfs_getattr ((int (*) __P((struct vop_getattr_args *)))mfs_badop) -#define mfs_setattr ((int (*) __P((struct vop_setattr_args *)))mfs_badop) -#define mfs_read ((int (*) __P((struct vop_read_args *)))mfs_badop) -#define mfs_write ((int (*) __P((struct vop_write_args *)))mfs_badop) -#define mfs_poll ((int (*) __P((struct vop_poll_args *)))mfs_badop) -#define mfs_mmap ((int (*) __P((struct vop_mmap_args *)))mfs_badop) -#define mfs_seek ((int (*) __P((struct vop_seek_args *)))mfs_badop) -#define mfs_remove ((int (*) __P((struct vop_remove_args *)))mfs_badop) -#define mfs_link ((int (*) __P((struct vop_link_args *)))mfs_badop) -#define mfs_rename ((int (*) __P((struct vop_rename_args *)))mfs_badop) -#define mfs_mkdir ((int (*) __P((struct vop_mkdir_args *)))mfs_badop) -#define mfs_rmdir ((int (*) __P((struct vop_rmdir_args *)))mfs_badop) -#define mfs_symlink ((int (*) __P((struct vop_symlink_args *)))mfs_badop) -#define mfs_readdir ((int (*) __P((struct vop_readdir_args *)))mfs_badop) -#define mfs_readlink ((int (*) __P((struct vop_readlink_args *)))mfs_badop) -#define mfs_abortop ((int (*) __P((struct vop_abortop_args *)))mfs_badop) -#define mfs_lock ((int (*) __P((struct vop_lock_args *)))vop_nolock) -#define mfs_unlock ((int (*) __P((struct vop_unlock_args *)))vop_nounlock) -#define mfs_islocked ((int(*) __P((struct vop_islocked_args *)))vop_noislocked) -#define mfs_pathconf ((int (*) __P((struct vop_pathconf_args *)))mfs_badop) -#define mfs_advlock ((int (*) __P((struct vop_advlock_args *)))mfs_badop) -#define mfs_blkatoff ((int (*) __P((struct vop_blkatoff_args *)))mfs_badop) -#define mfs_valloc ((int (*) __P((struct vop_valloc_args *)))mfs_badop) -#define mfs_vfree ((int (*) __P((struct vop_vfree_args *)))mfs_badop) -#define mfs_truncate ((int (*) __P((struct vop_truncate_args *)))mfs_badop) -#define mfs_update ((int (*) __P((struct vop_update_args *)))mfs_badop) -#define mfs_bwrite ((int (*) __P((struct vop_bwrite_args *)))vn_bwrite) - #endif |
