diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2014-07-09 21:18:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-09 12:18:43 -0700 |
| commit | 6353c97aa7c7dd6b0c3fe717eeacb39e3873259e (patch) | |
| tree | 74d467219b373ce6e0df25f9f1631dc8139008dd /drivers/block | |
| parent | 00790d4526bd88e711999b9af04a0e896cfbf5a8 (diff) | |
| download | linux-3.10-6353c97aa7c7dd6b0c3fe717eeacb39e3873259e.tar.gz linux-3.10-6353c97aa7c7dd6b0c3fe717eeacb39e3873259e.tar.bz2 linux-3.10-6353c97aa7c7dd6b0c3fe717eeacb39e3873259e.zip | |
drbd: fix regression 'out of mem, failed to invoke fence-peer helper'
commit bbc1c5e8ad6dfebf9d13b8a4ccdf66c92913eac9 upstream.
Since linux kernel 3.13, kthread_run() internally uses
wait_for_completion_killable(). We sometimes may use kthread_run()
while we still have a signal pending, which we used to kick our threads
out of potentially blocking network functions, causing kthread_run() to
mistake that as a new fatal signal and fail.
Fix: flush_signals() before kthread_run().
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_nl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 9e3f441e7e8..9c37f3d896a 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -514,6 +514,12 @@ void conn_try_outdate_peer_async(struct drbd_tconn *tconn) struct task_struct *opa; kref_get(&tconn->kref); + /* We may just have force_sig()'ed this thread + * to get it out of some blocking network function. + * Clear signals; otherwise kthread_run(), which internally uses + * wait_on_completion_killable(), will mistake our pending signal + * for a new fatal signal and fail. */ + flush_signals(current); opa = kthread_run(_try_outdate_peer_async, tconn, "drbd_async_h"); if (IS_ERR(opa)) { conn_err(tconn, "out of mem, failed to invoke fence-peer helper\n"); |