drbd: wait for meta data IO completion even with failed disk, unless force-detached

The intention of force-detach is to be able to deal with a completely
unresponsive lower level IO stack, which does not even deliver error
completions anymore, but no completion at all.

In all other cases, we must still wait for the meta data IO completion.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index dda4e384929e..8d8069758042 100644
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -1090,7 +1090,7 @@ static int bm_rw(struct drbd_conf *mdev, int rw, unsigned flags, unsigned lazy_w
          * "in_flight reached zero, all done" event.
          */
         if (!atomic_dec_and_test(&ctx->in_flight))
-                wait_until_done_or_disk_failure(mdev, mdev->ldev, &ctx->done);
+                wait_until_done_or_force_detached(mdev, mdev->ldev, &ctx->done);
         else
                 kref_put(&ctx->kref, &bm_aio_ctx_destroy);
 
@@ -1105,7 +1105,7 @@ static int bm_rw(struct drbd_conf *mdev, int rw, unsigned flags, unsigned lazy_w
         }
 
         if (atomic_read(&ctx->in_flight))
-                err = -EIO; /* Disk failed during IO... */
+                err = -EIO; /* Disk timeout/force-detach during IO... */
 
         now = jiffies;
         if (rw == WRITE) {
@@ -1224,11 +1224,11 @@ int drbd_bm_write_page(struct drbd_conf *mdev, unsigned int idx) __must_hold(loc
         }
 
         bm_page_io_async(ctx, idx, WRITE_SYNC);
-        wait_until_done_or_disk_failure(mdev, mdev->ldev, &ctx->done);
+        wait_until_done_or_force_detached(mdev, mdev->ldev, &ctx->done);
 
         if (ctx->error)
                 drbd_chk_io_error(mdev, 1, DRBD_META_IO_ERROR);
-                /* that should force detach, so the in memory bitmap will be
+                /* that causes us to detach, so the in memory bitmap will be
                  * gone in a moment as well. */
 
         mdev->bm_writ_cnt++;