Merge branch 'akpm-current/current'

[karo-tx-linux.git] / drivers / block / nbd.c

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 1b87623381e2b1183b5c9d57c870b7c10924f65e..93b3f99b6865fe721f7124412553cadf3c328e7a 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -444,9 +444,7 @@ static int nbd_thread_recv(struct nbd_device *nbd)
        spin_unlock_irqrestore(&nbd->tasks_lock, flags);
 
        if (signal_pending(current)) {
-               siginfo_t info;
-
-               ret = dequeue_signal_lock(current, &current->blocked, &info);
+               ret = kernel_dequeue_signal(NULL);
                dev_warn(nbd_to_dev(nbd), "pid %d, %s, got signal %d\n",
                         task_pid_nr(current), current->comm, ret);
                mutex_lock(&nbd->tx_lock);
@@ -560,11 +558,8 @@ static int nbd_thread_send(void *data)
                                         !list_empty(&nbd->waiting_queue));
 
                if (signal_pending(current)) {
-                       siginfo_t info;
-                       int ret;
+                       int ret = kernel_dequeue_signal(NULL);
 
-                       ret = dequeue_signal_lock(current, &current->blocked,
-                                                 &info);
                        dev_warn(nbd_to_dev(nbd), "pid %d, %s, got signal %d\n",
                                 task_pid_nr(current), current->comm, ret);
                        mutex_lock(&nbd->tx_lock);
@@ -592,10 +587,8 @@ static int nbd_thread_send(void *data)
        spin_unlock_irqrestore(&nbd->tasks_lock, flags);
 
        /* Clear maybe pending signals */
-       if (signal_pending(current)) {
-               siginfo_t info;
-               dequeue_signal_lock(current, &current->blocked, &info);
-       }
+       if (signal_pending(current))
+               kernel_dequeue_signal(NULL);
 
        return 0;
 }