From b2d248cb068e898ea18f500a6e37090ecb3a8d02 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 2 Aug 2006 01:25:28 +0000 Subject: [PATCH] Get rid of some unused fields in the fileops and adjust the declarations to use the '.field = blah' initialization method. --- sys/kern/kern_descrip.c | 20 +++++++++----------- sys/kern/kern_event.c | 20 +++++++++----------- sys/kern/sys_pipe.c | 14 +++++++++----- sys/kern/sys_socket.c | 14 +++++++++----- sys/kern/vfs_vnops.c | 26 +++++++++++++++++--------- sys/opencrypto/cryptodev.c | 20 +++++++++----------- sys/sys/file.h | 31 ++++++++++++++----------------- sys/sys/file2.h | 18 +++++++++--------- 8 files changed, 85 insertions(+), 78 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index f84bf52006..3200417ac0 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -70,7 +70,7 @@ * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.81.2.19 2004/02/28 00:43:31 tegge Exp $ - * $DragonFly: src/sys/kern/kern_descrip.c,v 1.70 2006/07/28 02:17:40 dillon Exp $ + * $DragonFly: src/sys/kern/kern_descrip.c,v 1.71 2006/08/02 01:25:25 dillon Exp $ */ #include "opt_compat.h" @@ -2461,16 +2461,14 @@ fildesc_drvinit(void *unused) * MPSAFE */ struct fileops badfileops = { - NULL, /* port */ - NULL, /* clone */ - badfo_readwrite, - badfo_readwrite, - badfo_ioctl, - badfo_poll, - badfo_kqfilter, - badfo_stat, - badfo_close, - badfo_shutdown + .fo_read = badfo_readwrite, + .fo_write = badfo_readwrite, + .fo_ioctl = badfo_ioctl, + .fo_poll = badfo_poll, + .fo_kqfilter = badfo_kqfilter, + .fo_stat = badfo_stat, + .fo_close = badfo_close, + .fo_shutdown = badfo_shutdown }; /* diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index c850e147d6..c78dcc789b 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/kern/kern_event.c,v 1.2.2.10 2004/04/04 07:03:14 cperciva Exp $ - * $DragonFly: src/sys/kern/kern_event.c,v 1.27 2006/06/05 07:26:10 dillon Exp $ + * $DragonFly: src/sys/kern/kern_event.c,v 1.28 2006/08/02 01:25:25 dillon Exp $ */ #include @@ -75,16 +75,14 @@ static void kqueue_wakeup(struct kqueue *kq); * MPSAFE */ static struct fileops kqueueops = { - NULL, /* port */ - NULL, /* clone */ - kqueue_read, - kqueue_write, - kqueue_ioctl, - kqueue_poll, - kqueue_kqfilter, - kqueue_stat, - kqueue_close, - nofo_shutdown + .fo_read = kqueue_read, + .fo_write = kqueue_write, + .fo_ioctl = kqueue_ioctl, + .fo_poll = kqueue_poll, + .fo_kqfilter = kqueue_kqfilter, + .fo_stat = kqueue_stat, + .fo_close = kqueue_close, + .fo_shutdown = nofo_shutdown }; static void knote_attach(struct knote *kn, struct filedesc *fdp); diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 8f2dcc1a25..9d458bd4e1 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -17,7 +17,7 @@ * are met. * * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.60.2.13 2002/08/05 15:05:15 des Exp $ - * $DragonFly: src/sys/kern/sys_pipe.c,v 1.39 2006/06/13 08:12:03 dillon Exp $ + * $DragonFly: src/sys/kern/sys_pipe.c,v 1.40 2006/08/02 01:25:25 dillon Exp $ */ /* @@ -104,10 +104,14 @@ static int pipe_stat (struct file *fp, struct stat *sb, struct ucred *cred); static int pipe_ioctl (struct file *fp, u_long cmd, caddr_t data, struct ucred *cred); static struct fileops pipeops = { - NULL, /* port */ - NULL, /* clone */ - pipe_read, pipe_write, pipe_ioctl, pipe_poll, pipe_kqfilter, - pipe_stat, pipe_close, pipe_shutdown + .fo_read = pipe_read, + .fo_write = pipe_write, + .fo_ioctl = pipe_ioctl, + .fo_poll = pipe_poll, + .fo_kqfilter = pipe_kqfilter, + .fo_stat = pipe_stat, + .fo_close = pipe_close, + .fo_shutdown = pipe_shutdown }; static void filt_pipedetach(struct knote *kn); diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index f4b2d4ffb4..dad3d77012 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -32,7 +32,7 @@ * * @(#)sys_socket.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/kern/sys_socket.c,v 1.28.2.2 2001/02/26 04:23:16 jlemon Exp $ - * $DragonFly: src/sys/kern/sys_socket.c,v 1.12 2006/06/13 08:12:03 dillon Exp $ + * $DragonFly: src/sys/kern/sys_socket.c,v 1.13 2006/08/02 01:25:25 dillon Exp $ */ #include @@ -55,10 +55,14 @@ #include struct fileops socketops = { - NULL, /* port */ - NULL, /* clone */ - soo_read, soo_write, soo_ioctl, soo_poll, sokqfilter, - soo_stat, soo_close, soo_shutdown + .fo_read = soo_read, + .fo_write = soo_write, + .fo_ioctl = soo_ioctl, + .fo_poll = soo_poll, + .fo_kqfilter = sokqfilter, + .fo_stat = soo_stat, + .fo_close = soo_close, + .fo_shutdown = soo_shutdown }; /* diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index ed4976160a..250b1bf21d 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -37,7 +37,7 @@ * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.87.2.13 2002/12/29 18:19:53 dillon Exp $ - * $DragonFly: src/sys/kern/vfs_vnops.c,v 1.41 2006/06/13 08:12:03 dillon Exp $ + * $DragonFly: src/sys/kern/vfs_vnops.c,v 1.42 2006/08/02 01:25:25 dillon Exp $ */ #include @@ -71,17 +71,25 @@ static int svn_write (struct file *fp, struct uio *uio, struct ucred *cred, int flags); struct fileops vnode_fileops = { - NULL, /* port */ - NULL, /* clone */ - vn_read, vn_write, vn_ioctl, vn_poll, vn_kqfilter, - vn_statfile, vn_closefile, nofo_shutdown + .fo_read = vn_read, + .fo_write = vn_write, + .fo_ioctl = vn_ioctl, + .fo_poll = vn_poll, + .fo_kqfilter = vn_kqfilter, + .fo_stat = vn_statfile, + .fo_close = vn_closefile, + .fo_shutdown = nofo_shutdown }; struct fileops specvnode_fileops = { - NULL, /* port */ - NULL, /* clone */ - svn_read, svn_write, vn_ioctl, vn_poll, vn_kqfilter, - vn_statfile, vn_closefile, nofo_shutdown + .fo_read = svn_read, + .fo_write = svn_write, + .fo_ioctl = vn_ioctl, + .fo_poll = vn_poll, + .fo_kqfilter = vn_kqfilter, + .fo_stat = vn_statfile, + .fo_close = vn_closefile, + .fo_shutdown = nofo_shutdown }; /* diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c index 9167051b6b..d82dc12efc 100644 --- a/sys/opencrypto/cryptodev.c +++ b/sys/opencrypto/cryptodev.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */ -/* $DragonFly: src/sys/opencrypto/cryptodev.c,v 1.18 2006/07/28 02:17:41 dillon Exp $ */ +/* $DragonFly: src/sys/opencrypto/cryptodev.c,v 1.19 2006/08/02 01:25:26 dillon Exp $ */ /* $OpenBSD: cryptodev.c,v 1.52 2002/06/19 07:22:46 deraadt Exp $ */ /* @@ -93,16 +93,14 @@ static int cryptof_stat(struct file *, struct stat *, struct ucred *); static int cryptof_close(struct file *); static struct fileops cryptofops = { - NULL, /* port */ - NULL, /* clone */ - cryptof_rw, - cryptof_rw, - cryptof_ioctl, - cryptof_poll, - cryptof_kqfilter, - cryptof_stat, - cryptof_close, - nofo_shutdown + .fo_read = cryptof_rw, + .fo_write = cryptof_rw, + .fo_ioctl = cryptof_ioctl, + .fo_poll = cryptof_poll, + .fo_kqfilter = cryptof_kqfilter, + .fo_stat = cryptof_stat, + .fo_close = cryptof_close, + .fo_shutdown = nofo_shutdown }; static struct csession *csefind(struct fcrypt *, u_int); diff --git a/sys/sys/file.h b/sys/sys/file.h index 89d68362f5..fdbb7692a5 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -32,7 +32,7 @@ * * @(#)file.h 8.3 (Berkeley) 1/9/95 * $FreeBSD: src/sys/sys/file.h,v 1.22.2.7 2002/11/21 23:39:24 sam Exp $ - * $DragonFly: src/sys/sys/file.h,v 1.21 2006/06/13 08:12:04 dillon Exp $ + * $DragonFly: src/sys/sys/file.h,v 1.22 2006/08/02 01:25:27 dillon Exp $ */ #ifndef _SYS_FILE_H_ @@ -69,22 +69,19 @@ struct lwkt_port; struct namecache; struct fileops { - struct lwkt_port *fo_port; - int (*fo_clone) (struct file *);/* additional work after dup */ - - int (*fold_read) (struct file *fp, struct uio *uio, - struct ucred *cred, int flags); - int (*fold_write) (struct file *fp, struct uio *uio, - struct ucred *cred, int flags); - int (*fold_ioctl) (struct file *fp, u_long com, caddr_t data, - struct ucred *cred); - int (*fold_poll) (struct file *fp, int events, - struct ucred *cred); - int (*fold_kqfilter) (struct file *fp, struct knote *kn); - int (*fold_stat) (struct file *fp, struct stat *sb, - struct ucred *cred); - int (*fold_close) (struct file *fp); - int (*fold_shutdown) (struct file *fp, int how); + int (*fo_read) (struct file *fp, struct uio *uio, + struct ucred *cred, int flags); + int (*fo_write) (struct file *fp, struct uio *uio, + struct ucred *cred, int flags); + int (*fo_ioctl) (struct file *fp, u_long com, caddr_t data, + struct ucred *cred); + int (*fo_poll) (struct file *fp, int events, + struct ucred *cred); + int (*fo_kqfilter)(struct file *fp, struct knote *kn); + int (*fo_stat) (struct file *fp, struct stat *sb, + struct ucred *cred); + int (*fo_close) (struct file *fp); + int (*fo_shutdown)(struct file *fp, int how); }; /* diff --git a/sys/sys/file2.h b/sys/sys/file2.h index 179c4566f9..98f218777e 100644 --- a/sys/sys/file2.h +++ b/sys/sys/file2.h @@ -32,7 +32,7 @@ * * @(#)file.h 8.3 (Berkeley) 1/9/95 * $FreeBSD: src/sys/sys/file.h,v 1.22.2.7 2002/11/21 23:39:24 sam Exp $ - * $DragonFly: src/sys/sys/file2.h,v 1.7 2006/05/22 00:52:31 dillon Exp $ + * $DragonFly: src/sys/sys/file2.h,v 1.8 2006/08/02 01:25:28 dillon Exp $ */ #ifndef _SYS_FILE2_H_ @@ -54,7 +54,7 @@ fo_read( int error; fhold(fp); - error = (*fp->f_ops->fold_read)(fp, uio, cred, flags); + error = (*fp->f_ops->fo_read)(fp, uio, cred, flags); fdrop(fp); return (error); } @@ -69,7 +69,7 @@ fo_write( int error; fhold(fp); - error = (*fp->f_ops->fold_write)(fp, uio, cred, flags); + error = (*fp->f_ops->fo_write)(fp, uio, cred, flags); fdrop(fp); return (error); } @@ -84,7 +84,7 @@ fo_ioctl( int error; fhold(fp); - error = (*fp->f_ops->fold_ioctl)(fp, com, data, cred); + error = (*fp->f_ops->fo_ioctl)(fp, com, data, cred); fdrop(fp); return (error); } @@ -98,7 +98,7 @@ fo_poll( int error; fhold(fp); - error = (*fp->f_ops->fold_poll)(fp, events, cred); + error = (*fp->f_ops->fo_poll)(fp, events, cred); fdrop(fp); return (error); } @@ -109,7 +109,7 @@ fo_stat(struct file *fp, struct stat *sb, struct ucred *cred) int error; fhold(fp); - error = (*fp->f_ops->fold_stat)(fp, sb, cred); + error = (*fp->f_ops->fo_stat)(fp, sb, cred); fdrop(fp); return (error); } @@ -117,19 +117,19 @@ fo_stat(struct file *fp, struct stat *sb, struct ucred *cred) static __inline int fo_close(struct file *fp) { - return ((*fp->f_ops->fold_close)(fp)); + return ((*fp->f_ops->fo_close)(fp)); } static __inline int fo_shutdown(struct file *fp, int how) { - return ((*fp->f_ops->fold_shutdown)(fp, how)); + return ((*fp->f_ops->fo_shutdown)(fp, how)); } static __inline int fo_kqfilter(struct file *fp, struct knote *kn) { - return ((*fp->f_ops->fold_kqfilter)(fp, kn)); + return ((*fp->f_ops->fo_kqfilter)(fp, kn)); } #endif /* _KERNEL */ -- 2.41.0