diff options
author | peter <peter@FreeBSD.org> | 1997-09-14 02:58:12 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1997-09-14 02:58:12 +0000 |
commit | ce7feabb13f41094afbd4e234c6f678a4453967a (patch) | |
tree | 0a930e64e09a2d4576012e8d1e569c188a15389a /sys/ufs | |
parent | 13141f4b232b76b274f95166bd837fba480bf0ee (diff) | |
download | FreeBSD-src-ce7feabb13f41094afbd4e234c6f678a4453967a.zip FreeBSD-src-ce7feabb13f41094afbd4e234c6f678a4453967a.tar.gz |
Convert select -> poll.
Delete 'always succeed' select/poll handlers, replaced with generic call.
Flag missing vnode op table entries.
Diffstat (limited to 'sys/ufs')
-rw-r--r-- | sys/ufs/ffs/ffs_vnops.c | 16 | ||||
-rw-r--r-- | sys/ufs/lfs/lfs_vnops.c | 24 | ||||
-rw-r--r-- | sys/ufs/mfs/mfs_vnops.c | 10 | ||||
-rw-r--r-- | sys/ufs/mfs/mfsnode.h | 4 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_extern.h | 4 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 20 |
6 files changed, 44 insertions, 34 deletions
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 256488a..a546fb8 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vnops.c 8.15 (Berkeley) 5/14/95 - * $Id: ffs_vnops.c,v 1.27 1997/08/26 07:32:48 phk Exp $ + * $Id: ffs_vnops.c,v 1.28 1997/09/02 20:06:46 bde Exp $ */ #include <sys/param.h> @@ -87,7 +87,7 @@ static struct vnodeopv_entry_desc ffs_vnodeop_entries[] = { { &vop_write_desc, (vop_t *)ffs_write }, /* write */ { &vop_lease_desc, (vop_t *)ufs_lease_check }, /* lease */ { &vop_ioctl_desc, (vop_t *)ufs_ioctl }, /* ioctl */ - { &vop_select_desc, (vop_t *)ufs_select }, /* select */ + { &vop_poll_desc, (vop_t *)ufs_poll }, /* poll */ { &vop_revoke_desc, (vop_t *)ufs_revoke }, /* revoke */ { &vop_mmap_desc, (vop_t *)ufs_mmap }, /* mmap */ { &vop_fsync_desc, (vop_t *)ffs_fsync }, /* fsync */ @@ -118,6 +118,7 @@ static struct vnodeopv_entry_desc ffs_vnodeop_entries[] = { { &vop_truncate_desc, (vop_t *)ffs_truncate }, /* truncate */ { &vop_update_desc, (vop_t *)ffs_update }, /* update */ { &vop_getpages_desc, (vop_t *)ffs_getpages}, /* getpages */ +/* XXX: vop_putpages */ { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ { NULL, NULL } }; @@ -128,7 +129,9 @@ vop_t **ffs_specop_p; static struct vnodeopv_entry_desc ffs_specop_entries[] = { { &vop_default_desc, (vop_t *)vn_default_error }, { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ +/* XXX: vop_cachedlookup */ { &vop_create_desc, (vop_t *)spec_create }, /* create */ +/* XXX: vop_whiteout */ { &vop_mknod_desc, (vop_t *)spec_mknod }, /* mknod */ { &vop_open_desc, (vop_t *)spec_open }, /* open */ { &vop_close_desc, (vop_t *)ufsspec_close }, /* close */ @@ -139,7 +142,7 @@ static struct vnodeopv_entry_desc ffs_specop_entries[] = { { &vop_write_desc, (vop_t *)ufsspec_write }, /* write */ { &vop_lease_desc, (vop_t *)spec_lease_check }, /* lease */ { &vop_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ - { &vop_select_desc, (vop_t *)spec_select }, /* select */ + { &vop_poll_desc, (vop_t *)spec_poll }, /* poll */ { &vop_revoke_desc, (vop_t *)spec_revoke }, /* revoke */ { &vop_mmap_desc, (vop_t *)spec_mmap }, /* mmap */ { &vop_fsync_desc, (vop_t *)ffs_fsync }, /* fsync */ @@ -170,6 +173,7 @@ static struct vnodeopv_entry_desc ffs_specop_entries[] = { { &vop_truncate_desc, (vop_t *)spec_truncate }, /* truncate */ { &vop_update_desc, (vop_t *)ffs_update }, /* update */ { &vop_getpages_desc, (vop_t *)spec_getpages}, /* getpages */ +/* XXX: vop_putpages */ { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ { NULL, NULL } }; @@ -180,7 +184,9 @@ vop_t **ffs_fifoop_p; static struct vnodeopv_entry_desc ffs_fifoop_entries[] = { { &vop_default_desc, (vop_t *)vn_default_error }, { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ +/* XXX: vop_cachedlookup */ { &vop_create_desc, (vop_t *)fifo_create }, /* create */ +/* XXX: vop_whiteout */ { &vop_mknod_desc, (vop_t *)fifo_mknod }, /* mknod */ { &vop_open_desc, (vop_t *)fifo_open }, /* open */ { &vop_close_desc, (vop_t *)ufsfifo_close }, /* close */ @@ -191,7 +197,7 @@ static struct vnodeopv_entry_desc ffs_fifoop_entries[] = { { &vop_write_desc, (vop_t *)ufsfifo_write }, /* write */ { &vop_lease_desc, (vop_t *)fifo_lease_check }, /* lease */ { &vop_ioctl_desc, (vop_t *)fifo_ioctl }, /* ioctl */ - { &vop_select_desc, (vop_t *)fifo_select }, /* select */ + { &vop_poll_desc, (vop_t *)fifo_poll }, /* poll */ { &vop_revoke_desc, (vop_t *)fifo_revoke }, /* revoke */ { &vop_mmap_desc, (vop_t *)fifo_mmap }, /* mmap */ { &vop_fsync_desc, (vop_t *)ffs_fsync }, /* fsync */ @@ -221,6 +227,8 @@ static struct vnodeopv_entry_desc ffs_fifoop_entries[] = { { &vop_vfree_desc, (vop_t *)ffs_vfree }, /* vfree */ { &vop_truncate_desc, (vop_t *)fifo_truncate }, /* truncate */ { &vop_update_desc, (vop_t *)ffs_update }, /* update */ +/* XXX: vop_getpages */ +/* XXX: vop_putpages */ { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ { NULL, NULL } }; diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c index cd9d9e5..80ba28f 100644 --- a/sys/ufs/lfs/lfs_vnops.c +++ b/sys/ufs/lfs/lfs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_vnops.c 8.13 (Berkeley) 6/10/95 - * $Id: lfs_vnops.c,v 1.21 1997/03/23 00:45:27 bde Exp $ + * $Id: lfs_vnops.c,v 1.22 1997/09/02 20:06:49 bde Exp $ */ #include <sys/param.h> @@ -74,9 +74,10 @@ vop_t **lfs_vnodeop_p; static struct vnodeopv_entry_desc lfs_vnodeop_entries[] = { { &vop_default_desc, (vop_t *)vn_default_error }, { &vop_lookup_desc, (vop_t *)ufs_lookup }, /* lookup */ +/* XXX: vop_cachedlookup */ { &vop_create_desc, (vop_t *)ufs_create }, /* create */ - { &vop_mknod_desc, (vop_t *)ufs_mknod }, /* mknod */ { &vop_whiteout_desc, (vop_t *)ufs_whiteout }, /* whiteout */ + { &vop_mknod_desc, (vop_t *)ufs_mknod }, /* mknod */ { &vop_open_desc, (vop_t *)ufs_open }, /* open */ { &vop_close_desc, (vop_t *)lfs_close }, /* close */ { &vop_access_desc, (vop_t *)ufs_access }, /* access */ @@ -86,7 +87,7 @@ static struct vnodeopv_entry_desc lfs_vnodeop_entries[] = { { &vop_write_desc, (vop_t *)lfs_write }, /* write */ { &vop_lease_desc, (vop_t *)ufs_lease_check }, /* lease */ { &vop_ioctl_desc, (vop_t *)ufs_ioctl }, /* ioctl */ - { &vop_select_desc, (vop_t *)ufs_select }, /* select */ + { &vop_poll_desc, (vop_t *)ufs_poll }, /* poll */ { &vop_revoke_desc, (vop_t *)ufs_revoke }, /* revoke */ { &vop_mmap_desc, (vop_t *)ufs_mmap }, /* mmap */ { &vop_fsync_desc, (vop_t *)lfs_fsync }, /* fsync */ @@ -112,9 +113,12 @@ static struct vnodeopv_entry_desc lfs_vnodeop_entries[] = { { &vop_advlock_desc, (vop_t *)ufs_advlock }, /* advlock */ { &vop_blkatoff_desc, (vop_t *)lfs_blkatoff }, /* blkatoff */ { &vop_valloc_desc, (vop_t *)lfs_valloc }, /* valloc */ +/* XXX: vop_reallocblks */ { &vop_vfree_desc, (vop_t *)lfs_vfree }, /* vfree */ { &vop_truncate_desc, (vop_t *)lfs_truncate }, /* truncate */ { &vop_update_desc, (vop_t *)lfs_update }, /* update */ +/* XXX: vop_getpages */ +/* XXX: vop_putpages */ { &vop_bwrite_desc, (vop_t *)lfs_bwrite }, /* bwrite */ { NULL, NULL } }; @@ -125,7 +129,9 @@ vop_t **lfs_specop_p; static struct vnodeopv_entry_desc lfs_specop_entries[] = { { &vop_default_desc, (vop_t *)vn_default_error }, { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ +/* XXX: vop_cachedlookup */ { &vop_create_desc, (vop_t *)spec_create }, /* create */ +/* XXX: vop_whiteout */ { &vop_mknod_desc, (vop_t *)spec_mknod }, /* mknod */ { &vop_open_desc, (vop_t *)spec_open }, /* open */ { &vop_close_desc, (vop_t *)ufsspec_close }, /* close */ @@ -136,7 +142,7 @@ static struct vnodeopv_entry_desc lfs_specop_entries[] = { { &vop_write_desc, (vop_t *)ufsspec_write }, /* write */ { &vop_lease_desc, (vop_t *)spec_lease_check }, /* lease */ { &vop_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ - { &vop_select_desc, (vop_t *)spec_select }, /* select */ + { &vop_poll_desc, (vop_t *)spec_poll }, /* poll */ { &vop_revoke_desc, (vop_t *)spec_revoke }, /* revoke */ { &vop_mmap_desc, (vop_t *)spec_mmap }, /* mmap */ { &vop_fsync_desc, (vop_t *)spec_fsync }, /* fsync */ @@ -162,9 +168,12 @@ static struct vnodeopv_entry_desc lfs_specop_entries[] = { { &vop_advlock_desc, (vop_t *)spec_advlock }, /* advlock */ { &vop_blkatoff_desc, (vop_t *)spec_blkatoff }, /* blkatoff */ { &vop_valloc_desc, (vop_t *)spec_valloc }, /* valloc */ +/* XXX: vop_reallocblks */ { &vop_vfree_desc, (vop_t *)lfs_vfree }, /* vfree */ { &vop_truncate_desc, (vop_t *)spec_truncate }, /* truncate */ { &vop_update_desc, (vop_t *)lfs_update }, /* update */ +/* XXX: vop_getpages */ +/* XXX: vop_putpages */ { &vop_bwrite_desc, (vop_t *)lfs_bwrite }, /* bwrite */ { NULL, NULL } }; @@ -175,7 +184,9 @@ vop_t **lfs_fifoop_p; static struct vnodeopv_entry_desc lfs_fifoop_entries[] = { { &vop_default_desc, (vop_t *)vn_default_error }, { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ +/* XXX: vop_cachedlookup */ { &vop_create_desc, (vop_t *)fifo_create }, /* create */ +/* XXX: vop_whiteout */ { &vop_mknod_desc, (vop_t *)fifo_mknod }, /* mknod */ { &vop_open_desc, (vop_t *)fifo_open }, /* open */ { &vop_close_desc, (vop_t *)ufsfifo_close }, /* close */ @@ -186,7 +197,7 @@ static struct vnodeopv_entry_desc lfs_fifoop_entries[] = { { &vop_write_desc, (vop_t *)ufsfifo_write }, /* write */ { &vop_lease_desc, (vop_t *)fifo_lease_check }, /* lease */ { &vop_ioctl_desc, (vop_t *)fifo_ioctl }, /* ioctl */ - { &vop_select_desc, (vop_t *)fifo_select }, /* select */ + { &vop_poll_desc, (vop_t *)fifo_poll }, /* poll */ { &vop_revoke_desc, (vop_t *)fifo_revoke }, /* revoke */ { &vop_mmap_desc, (vop_t *)fifo_mmap }, /* mmap */ { &vop_fsync_desc, (vop_t *)fifo_fsync }, /* fsync */ @@ -212,9 +223,12 @@ static struct vnodeopv_entry_desc lfs_fifoop_entries[] = { { &vop_advlock_desc, (vop_t *)fifo_advlock }, /* advlock */ { &vop_blkatoff_desc, (vop_t *)fifo_blkatoff }, /* blkatoff */ { &vop_valloc_desc, (vop_t *)fifo_valloc }, /* valloc */ +/* XXX: vop_reallocblks */ { &vop_vfree_desc, (vop_t *)lfs_vfree }, /* vfree */ { &vop_truncate_desc, (vop_t *)fifo_truncate }, /* truncate */ { &vop_update_desc, (vop_t *)lfs_update }, /* update */ +/* XXX: vop_getpages */ +/* XXX: vop_putpages */ { &vop_bwrite_desc, (vop_t *)lfs_bwrite }, /* bwrite */ { NULL, NULL } }; diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c index 335c4e3..06ea12d 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.17 1997/02/22 09:47:33 peter Exp $ + * $Id: mfs_vnops.c,v 1.18 1997/08/02 14:33:23 bde Exp $ */ #include <sys/param.h> @@ -63,7 +63,9 @@ vop_t **mfs_vnodeop_p; static struct vnodeopv_entry_desc mfs_vnodeop_entries[] = { { &vop_default_desc, (vop_t *)vn_default_error }, { &vop_lookup_desc, (vop_t *)mfs_lookup }, /* lookup */ +/* XXX: vop_cachedlookup */ { &vop_create_desc, (vop_t *)mfs_create }, /* create */ +/* XXX: vop_whiteout */ { &vop_mknod_desc, (vop_t *)mfs_mknod }, /* mknod */ { &vop_open_desc, (vop_t *)mfs_open }, /* open */ { &vop_close_desc, (vop_t *)mfs_close }, /* close */ @@ -72,8 +74,9 @@ static struct vnodeopv_entry_desc mfs_vnodeop_entries[] = { { &vop_setattr_desc, (vop_t *)mfs_setattr }, /* setattr */ { &vop_read_desc, (vop_t *)mfs_read }, /* read */ { &vop_write_desc, (vop_t *)mfs_write }, /* write */ +/* XXX: vop_lease */ { &vop_ioctl_desc, (vop_t *)mfs_ioctl }, /* ioctl */ - { &vop_select_desc, (vop_t *)mfs_select }, /* select */ + { &vop_poll_desc, (vop_t *)mfs_poll }, /* poll */ { &vop_revoke_desc, (vop_t *)mfs_revoke }, /* revoke */ { &vop_mmap_desc, (vop_t *)mfs_mmap }, /* mmap */ { &vop_fsync_desc, (vop_t *)spec_fsync }, /* fsync */ @@ -99,9 +102,12 @@ static struct vnodeopv_entry_desc mfs_vnodeop_entries[] = { { &vop_advlock_desc, (vop_t *)mfs_advlock }, /* advlock */ { &vop_blkatoff_desc, (vop_t *)mfs_blkatoff }, /* blkatoff */ { &vop_valloc_desc, (vop_t *)mfs_valloc }, /* valloc */ +/* XXX: vop_reallocblks */ { &vop_vfree_desc, (vop_t *)mfs_vfree }, /* vfree */ { &vop_truncate_desc, (vop_t *)mfs_truncate }, /* truncate */ { &vop_update_desc, (vop_t *)mfs_update }, /* update */ +/* XXX: vop_getpages */ +/* XXX: vop_putpages */ { &vop_bwrite_desc, (vop_t *)mfs_bwrite }, /* bwrite */ { NULL, NULL } }; diff --git a/sys/ufs/mfs/mfsnode.h b/sys/ufs/mfs/mfsnode.h index eb0a510..53fe40a 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$ + * $Id: mfsnode.h,v 1.8 1997/02/22 09:47:34 peter Exp $ */ #ifndef _UFS_MFS_MFSNODE_H_ @@ -66,7 +66,7 @@ struct mfsnode { #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_select ((int (*) __P((struct vop_select_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) diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h index 690e31c..b4880ad 100644 --- a/sys/ufs/ufs/ufs_extern.h +++ b/sys/ufs/ufs/ufs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_extern.h 8.10 (Berkeley) 5/14/95 - * $Id: ufs_extern.h,v 1.15 1997/08/16 19:16:26 wollman Exp $ + * $Id: ufs_extern.h,v 1.16 1997/08/26 07:32:50 phk Exp $ */ #ifndef _UFS_UFS_EXTERN_H_ @@ -110,7 +110,7 @@ int ufs_rename __P((struct vop_rename_args *)); int ufs_rmdir __P((struct vop_rmdir_args *)); int ufs_root __P((struct mount *, struct vnode **)); int ufs_seek __P((struct vop_seek_args *)); -int ufs_select __P((struct vop_select_args *)); +#define ufs_poll vop_nopoll int ufs_setattr __P((struct vop_setattr_args *)); int ufs_start __P((struct mount *, int, struct proc *)); int ufs_strategy __P((struct vop_strategy_args *)); diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 471977f..5576990 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 - * $Id: ufs_vnops.c,v 1.55 1997/08/26 04:36:27 dyson Exp $ + * $Id: ufs_vnops.c,v 1.56 1997/09/02 20:06:59 bde Exp $ */ #include "opt_quota.h" @@ -598,24 +598,6 @@ ufs_ioctl(ap) return (ENOTTY); } -/* ARGSUSED */ -int -ufs_select(ap) - struct vop_select_args /* { - struct vnode *a_vp; - int a_which; - int a_fflags; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap; -{ - - /* - * We should really check to see if I/O is possible. - */ - return (1); -} - /* * Mmap a file * |