[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20151025133359.GB19437@redhat.com>
Date: Sun, 25 Oct 2015 14:33:59 +0100
From: Oleg Nesterov <oleg@...hat.com>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: David Woodhouse <dwmw2@...radead.org>, Felipe Balbi <balbi@...com>,
Markus Pargmann <mpa@...gutronix.de>,
Tejun Heo <tj@...nel.org>, linux-kernel@...r.kernel.org,
linux-mtd@...ts.infradead.org
Subject: [PATCH -mm]
signal-turn-dequeue_signal_lock-into-kernel_dequeue_signal-fix
Andrew,
As Markus reports (thanks!)
signal-turn-dequeue_signal_lock-into-kernel_dequeue_signal.patch
conflicts with the recent change in Linus' tree,
> I just realised that this patch will conflict with a fixup patch for nbd
> that will be included in rc7.
>
> dcc909d90ccd (nbd: Add locking for tasks)
>
> I think there is basically one new instance of dequeue_signal_lock() that
> needs to be replaced with kernel_dequeue_signal().
Unless I missed something, this new dequeue_signal_lock() should simply
die, but lets fix the conflict first.
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -592,10 +592,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, ¤t->blocked, &info);
- }
+ if (signal_pending(current))
+ kernel_dequeue_signal(NULL);
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists