diff options
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_vnops.c | 9 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_vnops.c | 3 | ||||
| -rw-r--r-- | sys/ufs/mfs/mfs_vnops.c | 5 | ||||
| -rw-r--r-- | sys/ufs/mfs/mfsnode.h | 3 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_extern.h | 4 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 24 |
6 files changed, 16 insertions, 32 deletions
diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c index fffdd494d5a..defbaedf0cb 100644 --- a/sys/ufs/ext2fs/ext2fs_vnops.c +++ b/sys/ufs/ext2fs/ext2fs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vnops.c,v 1.18 2001/11/27 05:27:12 art Exp $ */ +/* $OpenBSD: ext2fs_vnops.c,v 1.19 2001/12/04 22:44:32 art Exp $ */ /* $NetBSD: ext2fs_vnops.c,v 1.30 2000/11/27 08:39:53 chs Exp $ */ /* @@ -1471,6 +1471,7 @@ struct vnodeopv_entry_desc ext2fs_vnodeop_entries[] = { { &vop_getpages_desc, genfs_getpages }, { &vop_putpages_desc, genfs_putpages }, { &vop_size_desc, genfs_size }, + { &vop_mmap_desc, ufs_mmap }, { NULL, NULL } }; struct vnodeopv_desc ext2fs_vnodeop_opv_desc = @@ -1514,7 +1515,8 @@ struct vnodeopv_entry_desc ext2fs_specop_entries[] = { { &vop_pathconf_desc, spec_pathconf }, /* pathconf */ { &vop_advlock_desc, spec_advlock }, /* advlock */ { &vop_bwrite_desc, vop_generic_bwrite }, /* bwrite */ - { (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL } + { &vop_mmap_desc, spec_mmap }, + { NULL, NULL } }; struct vnodeopv_desc ext2fs_specop_opv_desc = { &ext2fs_specop_p, ext2fs_specop_entries }; @@ -1558,7 +1560,8 @@ struct vnodeopv_entry_desc ext2fs_fifoop_entries[] = { { &vop_pathconf_desc, fifo_pathconf }, /* pathconf */ { &vop_advlock_desc, fifo_advlock }, /* advlock */ { &vop_bwrite_desc, vop_generic_bwrite }, /* bwrite */ - { (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL } + { &vop_mmap_desc, fifo_mmap }, + { NULL, NULL } }; struct vnodeopv_desc ext2fs_fifoop_opv_desc = { &ext2fs_fifoop_p, ext2fs_fifoop_entries }; diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 8190ef82eb3..f3cfb4c3f46 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vnops.c,v 1.21 2001/11/27 05:27:12 art Exp $ */ +/* $OpenBSD: ffs_vnops.c,v 1.22 2001/12/04 22:44:32 art Exp $ */ /* $NetBSD: ffs_vnops.c,v 1.7 1996/05/11 18:27:24 mycroft Exp $ */ /* @@ -111,6 +111,7 @@ struct vnodeopv_entry_desc ffs_vnodeop_entries[] = { { &vop_getpages_desc, genfs_getpages }, { &vop_putpages_desc, genfs_putpages }, { &vop_size_desc, ffs_size }, + { &vop_mmap_desc, ufs_mmap }, { NULL, NULL } }; diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c index a0a666222e1..cacf6fce8ee 100644 --- a/sys/ufs/mfs/mfs_vnops.c +++ b/sys/ufs/mfs/mfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfs_vnops.c,v 1.16 2001/06/23 02:07:56 csapuntz Exp $ */ +/* $OpenBSD: mfs_vnops.c,v 1.17 2001/12/04 22:44:32 art Exp $ */ /* $NetBSD: mfs_vnops.c,v 1.8 1996/03/17 02:16:32 christos Exp $ */ /* @@ -93,7 +93,8 @@ struct vnodeopv_entry_desc mfs_vnodeop_entries[] = { { &vop_pathconf_desc, mfs_pathconf }, /* pathconf */ { &vop_advlock_desc, mfs_advlock }, /* advlock */ { &vop_bwrite_desc, mfs_bwrite }, /* bwrite */ - { (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL } + { &vop_mmap_desc, mfs_mmap }, + { NULL, NULL } }; struct vnodeopv_desc mfs_vnodeop_opv_desc = { &mfs_vnodeop_p, mfs_vnodeop_entries }; diff --git a/sys/ufs/mfs/mfsnode.h b/sys/ufs/mfs/mfsnode.h index cdae3c783a2..dbf8b7dd2c2 100644 --- a/sys/ufs/mfs/mfsnode.h +++ b/sys/ufs/mfs/mfsnode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mfsnode.h,v 1.7 1998/08/06 19:35:11 csapuntz Exp $ */ +/* $OpenBSD: mfsnode.h,v 1.8 2001/12/04 22:44:32 art Exp $ */ /* $NetBSD: mfsnode.h,v 1.3 1996/02/09 22:31:31 christos Exp $ */ /* @@ -87,3 +87,4 @@ struct mfsnode { #define mfs_truncate mfs_badop #define mfs_update nullop #define mfs_bwrite vop_generic_bwrite +#define mfs_mmap mfs_badop
\ No newline at end of file diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h index fc39e16b45e..a89656344c0 100644 --- a/sys/ufs/ufs/ufs_extern.h +++ b/sys/ufs/ufs/ufs_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_extern.h,v 1.13 2001/11/27 05:27:12 art Exp $ */ +/* $OpenBSD: ufs_extern.h,v 1.14 2001/12/04 22:44:32 art Exp $ */ /* $NetBSD: ufs_extern.h,v 1.5 1996/02/09 22:36:03 christos Exp $ */ /*- @@ -78,7 +78,6 @@ int ufs_lock __P((void *)); int ufs_lookup __P((void *)); int ufs_mkdir __P((void *)); int ufs_mknod __P((void *)); -int ufs_mmap __P((void *)); int ufs_open __P((void *)); int ufs_pathconf __P((void *)); int ufs_print __P((void *)); @@ -99,6 +98,7 @@ int ufs_whiteout __P((void *)); int ufsspec_close __P((void *)); int ufsspec_read __P((void *)); int ufsspec_write __P((void *)); +#define ufs_mmap genfs_mmap #ifdef FIFO int ufsfifo_read __P((void *)); diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index e926ee7aff6..e61259fa820 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_vnops.c,v 1.40 2001/11/27 05:27:12 art Exp $ */ +/* $OpenBSD: ufs_vnops.c,v 1.41 2001/12/04 22:44:32 art Exp $ */ /* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */ /* @@ -604,28 +604,6 @@ ufs_select(v) } /* - * Mmap a file - * - * NB Currently unsupported. - */ -/* ARGSUSED */ -int -ufs_mmap(v) - void *v; -{ -#if 0 - struct vop_mmap_args /* { - struct vnode *a_vp; - int a_fflags; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap = v; -#endif - - return (EINVAL); -} - -/* * Seek on a file * * Nothing to do, so just return. |