From: Benjamin Kaduk Date: Wed, 27 May 2015 20:13:13 +0000 (-0400) Subject: afs: Do not supply bogus poll vnodeops for FBSD X-Git-Tag: upstream/1.8.0_pre1^2~317 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=74ffe9bc78a898361bdcb3b97cb512bac338c62a;p=packages%2Fo%2Fopenafs.git afs: Do not supply bogus poll vnodeops for FBSD We currently provide one which just always returns 1, but the kernel provides a vop_nopoll which conceptually is the same thing. That one, however, provides some feature checks and fails when consumers ask for fancy features that are not portable. Change-Id: Iba03904aac2883e18a1abdd4f09289b6c6f907c0 Reviewed-on: http://gerrit.openafs.org/11882 Tested-by: BuildBot Reviewed-by: Chas Williams <3chas3@gmail.com> Reviewed-by: Jeffrey Altman --- diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c index 0e55cc162..b2f595634 100644 --- a/src/afs/FBSD/osi_vnodeops.c +++ b/src/afs/FBSD/osi_vnodeops.c @@ -79,7 +79,6 @@ static vop_mkdir_t afs_vop_mkdir; static vop_mknod_t afs_vop_mknod; static vop_open_t afs_vop_open; static vop_pathconf_t afs_vop_pathconf; -static vop_poll_t afs_vop_poll; static vop_print_t afs_vop_print; static vop_putpages_t afs_vop_putpages; static vop_read_t afs_vop_read; @@ -120,7 +119,6 @@ struct vop_vector afs_vnodeops = { .vop_mknod = afs_vop_mknod, .vop_open = afs_vop_open, .vop_pathconf = afs_vop_pathconf, - .vop_poll = afs_vop_poll, .vop_print = afs_vop_print, .vop_putpages = afs_vop_putpages, .vop_read = afs_vop_read, @@ -157,7 +155,6 @@ int afs_vop_getpages(struct vop_getpages_args *); int afs_vop_putpages(struct vop_putpages_args *); int afs_vop_ioctl(struct vop_ioctl_args *); static int afs_vop_pathconf(struct vop_pathconf_args *); -int afs_vop_poll(struct vop_poll_args *); int afs_vop_fsync(struct vop_fsync_args *); int afs_vop_remove(struct vop_remove_args *); int afs_vop_link(struct vop_link_args *); @@ -200,7 +197,7 @@ struct vnodeopv_entry_desc afs_vnodeop_entries[] = { {&vop_mknod_desc, (vop_t *) afs_vop_mknod}, /* mknod */ {&vop_open_desc, (vop_t *) afs_vop_open}, /* open */ {&vop_pathconf_desc, (vop_t *) afs_vop_pathconf}, /* pathconf */ - {&vop_poll_desc, (vop_t *) afs_vop_poll}, /* select */ + {&vop_poll_desc, (vop_t *) vop_nopoll}, /* select */ {&vop_print_desc, (vop_t *) afs_vop_print}, /* print */ {&vop_read_desc, (vop_t *) afs_vop_read}, /* read */ {&vop_readdir_desc, (vop_t *) afs_vop_readdir}, /* readdir */ @@ -1081,22 +1078,6 @@ afs_vop_ioctl(ap) } } -/* ARGSUSED */ -int -afs_vop_poll(ap) - struct vop_poll_args /* { - * struct vnode *a_vp; - * int a_events; - * struct ucred *a_cred; - * struct thread *td; - * } */ *ap; -{ - /* - * We should really check to see if I/O is possible. - */ - return (1); -} - int afs_vop_fsync(ap) struct vop_fsync_args /* {