From ad1e0609a0f388345b0dc3f8777f6c60c595fe73 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Thu, 1 Dec 2016 12:10:34 +0100 Subject: [PATCH] server: Get rid of no loner used cancel_async from fd_ops. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- server/change.c | 6 ++---- server/console.c | 3 +-- server/device.c | 3 +-- server/fd.c | 6 ------ server/file.c | 3 +-- server/file.h | 3 --- server/mailslot.c | 9 +++------ server/mapping.c | 3 +-- server/named_pipe.c | 9 +++------ server/request.c | 3 +-- server/serial.c | 3 +-- server/signal.c | 3 +-- server/sock.c | 6 ++---- server/thread.c | 3 +-- 14 files changed, 18 insertions(+), 45 deletions(-) diff --git a/server/change.c b/server/change.c index 7c0ca990bfa..ee30b98a770 100644 --- a/server/change.c +++ b/server/change.c @@ -189,8 +189,7 @@ static const struct fd_ops dir_fd_ops = no_fd_flush, /* flush */ default_fd_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ - default_fd_cancel_async /* cancel_async */ + default_fd_reselect_async /* reselect_async */ }; static struct list change_list = LIST_INIT(change_list); @@ -701,8 +700,7 @@ static const struct fd_ops inotify_fd_ops = NULL, /* get_fd_type */ NULL, /* ioctl */ NULL, /* queue_async */ - NULL, /* reselect_async */ - NULL, /* cancel_async */ + NULL /* reselect_async */ }; static int inotify_get_poll_events( struct fd *fd ) diff --git a/server/console.c b/server/console.c index 32d3137ab6c..5b69e769a61 100644 --- a/server/console.c +++ b/server/console.c @@ -193,8 +193,7 @@ static const struct fd_ops console_fd_ops = no_fd_flush, /* flush */ default_fd_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ - default_fd_cancel_async /* cancel_async */ + default_fd_reselect_async /* reselect_async */ }; static struct list screen_buffer_list = LIST_INIT(screen_buffer_list); diff --git a/server/device.c b/server/device.c index 0bc798af98e..2a34cfba05a 100644 --- a/server/device.c +++ b/server/device.c @@ -220,8 +220,7 @@ static const struct fd_ops device_file_fd_ops = device_file_flush, /* flush */ device_file_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ - default_fd_cancel_async /* cancel_async */ + default_fd_reselect_async /* reselect_async */ }; diff --git a/server/fd.c b/server/fd.c index a75ff769c5a..faf27bc9f39 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2115,12 +2115,6 @@ void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ) } } -/* default cancel_async() fd routine */ -int default_fd_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ) -{ - return 0; -} - static inline int is_valid_mounted_device( struct stat *st ) { #if defined(linux) || defined(__sun__) diff --git a/server/file.c b/server/file.c index dacb24a3c46..2f5371dbb4e 100644 --- a/server/file.c +++ b/server/file.c @@ -109,8 +109,7 @@ static const struct fd_ops file_fd_ops = file_flush, /* flush */ default_fd_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ - default_fd_cancel_async /* cancel_async */ + default_fd_reselect_async /* reselect_async */ }; static inline int is_overlapped( const struct file *file ) diff --git a/server/file.h b/server/file.h index 7c68248a720..19e638ee352 100644 --- a/server/file.h +++ b/server/file.h @@ -51,8 +51,6 @@ struct fd_ops void (*queue_async)(struct fd *, const async_data_t *data, int type, int count); /* selected events for async i/o need an update */ void (*reselect_async)( struct fd *, struct async_queue *queue ); - /* cancel an async operation */ - int (*cancel_async)(struct fd *, struct process *process, struct thread *thread, client_ptr_t iosb); }; /* file descriptor functions */ @@ -99,7 +97,6 @@ extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const as extern void no_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); extern void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); extern void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ); -extern int default_fd_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ); extern void main_loop(void); extern void remove_process_locks( struct process *process ); diff --git a/server/mailslot.c b/server/mailslot.c index 13e67031c16..3ddfab5ea28 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -106,8 +106,7 @@ static const struct fd_ops mailslot_fd_ops = no_fd_flush, /* flush */ default_fd_ioctl, /* ioctl */ mailslot_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ - default_fd_cancel_async /* cancel_async */ + default_fd_reselect_async /* reselect_async */ }; @@ -160,8 +159,7 @@ static const struct fd_ops mail_writer_fd_ops = no_fd_flush, /* flush */ default_fd_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ - default_fd_cancel_async /* cancel_async */ + default_fd_reselect_async /* reselect_async */ }; @@ -214,8 +212,7 @@ static const struct fd_ops mailslot_device_fd_ops = no_fd_flush, /* flush */ default_fd_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ - default_fd_cancel_async /* cancel_async */ + default_fd_reselect_async /* reselect_async */ }; static void mailslot_destroy( struct object *obj) diff --git a/server/mapping.c b/server/mapping.c index f82907ba983..f03ea7a6f63 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -108,8 +108,7 @@ static const struct fd_ops mapping_fd_ops = no_fd_flush, /* flush */ no_fd_ioctl, /* ioctl */ no_fd_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ - default_fd_cancel_async /* cancel_async */ + default_fd_reselect_async /* reselect_async */ }; static struct list shared_list = LIST_INIT(shared_list); diff --git a/server/named_pipe.c b/server/named_pipe.c index b032901e032..55d05c183ce 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -179,8 +179,7 @@ static const struct fd_ops pipe_server_fd_ops = pipe_server_flush, /* flush */ pipe_server_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ - default_fd_cancel_async, /* cancel_async */ + default_fd_reselect_async /* reselect_async */ }; /* client end functions */ @@ -223,8 +222,7 @@ static const struct fd_ops pipe_client_fd_ops = pipe_client_flush, /* flush */ default_fd_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ - default_fd_cancel_async /* cancel_async */ + default_fd_reselect_async /* reselect_async */ }; static void named_pipe_device_dump( struct object *obj, int verbose ); @@ -271,8 +269,7 @@ static const struct fd_ops named_pipe_device_fd_ops = no_fd_flush, /* flush */ named_pipe_device_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ - default_fd_cancel_async /* cancel_async */ + default_fd_reselect_async /* reselect_async */ }; static void named_pipe_dump( struct object *obj, int verbose ) diff --git a/server/request.c b/server/request.c index b937e6f06a4..781889cc785 100644 --- a/server/request.c +++ b/server/request.c @@ -119,8 +119,7 @@ static const struct fd_ops master_socket_fd_ops = NULL, /* get_fd_type */ NULL, /* ioctl */ NULL, /* queue_async */ - NULL, /* reselect_async */ - NULL /* cancel_async */ + NULL /* reselect_async */ }; diff --git a/server/serial.c b/server/serial.c index 03d726a98ea..df462ea6ef4 100644 --- a/server/serial.c +++ b/server/serial.c @@ -120,8 +120,7 @@ static const struct fd_ops serial_fd_ops = no_fd_flush, /* flush */ default_fd_ioctl, /* ioctl */ serial_queue_async, /* queue_async */ - serial_reselect_async, /* reselect_async */ - default_fd_cancel_async /* cancel_async */ + serial_reselect_async /* reselect_async */ }; /* check if the given fd is a serial port */ diff --git a/server/signal.c b/server/signal.c index c20e1544b44..74416fab7be 100644 --- a/server/signal.c +++ b/server/signal.c @@ -91,8 +91,7 @@ static const struct fd_ops handler_fd_ops = NULL, /* get_fd_type */ NULL, /* ioctl */ NULL, /* queue_async */ - NULL, /* reselect_async */ - NULL /* cancel_async */ + NULL /* reselect_async */ }; static struct handler *handler_sighup; diff --git a/server/sock.c b/server/sock.c index 2cd3b0e5885..a3c88a08f99 100644 --- a/server/sock.c +++ b/server/sock.c @@ -169,8 +169,7 @@ static const struct fd_ops sock_fd_ops = no_fd_flush, /* flush */ sock_ioctl, /* ioctl */ sock_queue_async, /* queue_async */ - sock_reselect_async, /* reselect_async */ - default_fd_cancel_async /* cancel_async */ + sock_reselect_async /* reselect_async */ }; @@ -1002,8 +1001,7 @@ static const struct fd_ops ifchange_fd_ops = no_fd_flush, /* flush */ no_fd_ioctl, /* ioctl */ NULL, /* queue_async */ - NULL, /* reselect_async */ - NULL /* cancel_async */ + NULL /* reselect_async */ }; static void ifchange_dump( struct object *obj, int verbose ) diff --git a/server/thread.c b/server/thread.c index 5f8405b4af2..e18c208121d 100644 --- a/server/thread.c +++ b/server/thread.c @@ -163,8 +163,7 @@ static const struct fd_ops thread_fd_ops = NULL, /* get_fd_type */ NULL, /* ioctl */ NULL, /* queue_async */ - NULL, /* reselect_async */ - NULL /* cancel_async */ + NULL /* reselect_async */ }; static struct list thread_list = LIST_INIT(thread_list); -- 2.11.4.GIT