Constraints in page allocation, and code changes to use them; shadow paging allocati...

[palacios.git] / linux_module / iface-keyed-stream.c

diff --git a/linux_module/iface-keyed-stream.c b/linux_module/iface-keyed-stream.c
index 34b39dc..3b36d6a 100644 (file)
--- a/linux_module/iface-keyed-stream.c
+++ b/linux_module/iface-keyed-stream.c
@@ -1759,12 +1759,12 @@ static unsigned int keyed_stream_poll_user(struct file *filp, poll_table *wait)
     
     palacios_spinlock_lock_irqsave(&(s->lock), flags);
 
+    poll_wait(filp, &(s->user_wait_queue), wait);
+
     if (s->waiting) {
        palacios_spinlock_unlock_irqrestore(&(s->lock), flags);
        return POLLIN | POLLRDNORM;
     }
-
-    poll_wait(filp, &(s->user_wait_queue), wait);
     
     palacios_spinlock_unlock_irqrestore(&(s->lock), flags);
 
@@ -3156,6 +3156,8 @@ static int deinit_keyed_streams( void )
 {
     palacios_free_htable(mem_streams,1,1);
 
+    palacios_spinlock_deinit(&(user_streams->lock));
+
     palacios_free(user_streams);
 
     WARNING("Deinit of Palacios Keyed Streams likely leaked memory\n");