drbd: Immediately allow completion of IOs, that wait for IO completions on a failed disk

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 8e489a6d022e..16969c2b96cd 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -368,6 +368,12 @@ static void _tl_restart(struct drbd_conf *mdev, enum drbd_req_event what)
                 }
                 tmp = b->next;
 
+                if (what == abort_disk_io) {
+                        /* Only walk the TL, leave barrier objects in place */
+                        b = tmp;
+                        continue;
+                }
+
                 if (n_writes) {
                         if (what == resend) {
                                 b->n_writes = n_writes;
@@ -1565,6 +1571,10 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
                 eh = mdev->ldev->dc.on_io_error;
                 was_io_error = test_and_clear_bit(WAS_IO_ERROR, &mdev->flags);
 
+                /* Immediately allow completion of all application IO, that waits
+                   for completion from the local disk. */
+                tl_restart(mdev, abort_disk_io);
+
                 /* current state still has to be D_FAILED,
                  * there is only one way out: to D_DISKLESS,
                  * and that may only happen after our put_ldev below. */