[PATCH 1/2] server: Remove support for waiting on an IRP object.

[Zebediah Figura]

This was initially used to let the client wait on IRP completion;
c56c42ff79515a79b1913d31e21d6fecd7c11ef5 changed it to use the async handle
instead.

Signed-off-by: Zebediah Figura 
---
 server/device.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/server/device.c b/server/device.c
index 6400751e339..b669921a003 100644
--- a/server/device.c
+++ b/server/device.c
@@ -57,7 +57,6 @@ struct irp_call
 };

static void irp_call_dump( struct object *obj, int verbose );
-static int irp_call_signaled( struct object *obj, struct wait_queue_entry *entry );
 static void irp_call_destroy( struct object *obj );

static const struct object_ops irp_call_ops =
@@ -65,10 +64,10 @@ static const struct object_ops irp_call_ops =
     sizeof(struct irp_call),          /* size */
     &no_type,                         /* type */
     irp_call_dump,                    /* dump */
-    add_queue,                        /* add_queue */
-    remove_queue,                     /* remove_queue */
-    irp_call_signaled,                /* signaled */
-    no_satisfied,                     /* satisfied */
+    no_add_queue,                     /* add_queue */
+    NULL,                             /* remove_queue */
+    NULL,                             /* signaled */
+    NULL,                             /* satisfied */
     no_signal,                        /* signal */
     no_get_fd,                        /* get_fd */
     default_map_access,               /* map_access */
@@ -335,13 +334,6 @@ static void irp_call_dump( struct object *obj, int verbose )
     fprintf( stderr, "IRP call file=%p\n", irp->file );
 }

-static int irp_call_signaled( struct object *obj, struct wait_queue_entry *entry )
-{
-    struct irp_call *irp = (struct irp_call *)obj;
-
-    return !irp->file;  /* file is cleared once the irp has completed */
-}
-
 static void irp_call_destroy( struct object *obj )
 {
     struct irp_call *irp = (struct irp_call *)obj;
@@ -411,7 +403,6 @@ static void set_irp_result( struct irp_call *irp, unsigned int status,
         release_object( irp->async );
         irp->async = NULL;
     }
-    wake_up( &irp->obj, 0 );

release_object( irp );  /* no longer on the device queue */
     release_object( file );

[PATCH 2/2] server: Remove a redundant NULL check for async->fd.

[Zebediah Figura]

If the async has not been terminated yet, async->fd cannot be NULL.

Signed-off-by: Zebediah Figura 
---
 server/async.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/async.c b/server/async.c
index dbd4859edc4..442d98d8c7a 100644
--- a/server/async.c
+++ b/server/async.c
@@ -448,7 +448,7 @@ restart:
     LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry )
     {
         if (async->status != STATUS_PENDING) continue;
-        if ((!obj || (async->fd && get_fd_user( async->fd ) == obj)) &&
+        if ((!obj || (get_fd_user( async->fd ) == obj)) &&
             (!thread || async->thread == thread) &&
             (!iosb || async->data.iosb == iosb))
         {