server: Get rid of no loner used cancel_async from fd_ops.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

server: Get rid of no loner used cancel_async from fd_ops.
ad1e0609 · Jacek Caban · Alexandre Julliard · 055918c9 · ad1e0609 · ad1e0609
Commit ad1e0609 authored Dec 01, 2016 by Jacek Caban Committed by Alexandre Julliard Dec 01, 2016
14 changed files
--- 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 )

--- 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);

--- 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 */
 };



--- 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__)

--- 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 )

--- 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 );


--- 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)

--- 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);

--- 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 )

--- 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 */
 };



--- 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 */

--- 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;

--- 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 )

--- 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);