From f2213dd23f93d6e3534b7ca3481f0ccf21f4487a Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Mon, 3 Dec 2007 17:47:31 +0800 Subject: [PATCH] server: Make fd_poll_event static. --- server/fd.c | 11 +++++------ server/file.h | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/server/fd.c b/server/fd.c index 4bfb3e1161d..74c09cedf78 100644 --- a/server/fd.c +++ b/server/fd.c @@ -428,6 +428,11 @@ static struct fd **freelist; /* list of free entries in the array static int get_next_timeout(void); +static inline void fd_poll_event( struct fd *fd, int event ) +{ + fd->fd_ops->poll_event( fd, event ); +} + #ifdef USE_EPOLL static int epoll_fd = -1; @@ -1689,12 +1694,6 @@ int fd_close_handle( struct object *obj, struct process *process, obj_handle_t h return (!current || current->process == process); } -/* callback for event happening in the main poll() loop */ -void fd_poll_event( struct fd *fd, int event ) -{ - return fd->fd_ops->poll_event( fd, event ); -} - /* check if events are pending and if yes return which one(s) */ int check_fd_events( struct fd *fd, int events ) { diff --git a/server/file.h b/server/file.h index 1c659beceec..e444007da18 100644 --- a/server/file.h +++ b/server/file.h @@ -65,7 +65,6 @@ extern int get_unix_fd( struct fd *fd ); extern int is_same_file_fd( struct fd *fd1, struct fd *fd2 ); extern int is_fd_removable( struct fd *fd ); extern int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); -extern void fd_poll_event( struct fd *fd, int event ); extern int check_fd_events( struct fd *fd, int events ); extern void set_fd_events( struct fd *fd, int events ); extern obj_handle_t lock_fd( struct fd *fd, file_pos_t offset, file_pos_t count, int shared, int wait ); -- 2.11.4.GIT