drbd: always write bitmap on detach

If we detach due to local read-error (which sets a bit in the bitmap),
stay Primary, and then re-attach (which re-reads the bitmap from disk),
we potentially lost the "out-of-sync" (or, "bad block") information in
the bitmap.

Always (try to) write out the changed bitmap pages before going diskless.

That way, we don't lose the bit for the bad block,
the next resync will fetch it from the peer, and rewrite
it locally, which may result in block reallocation in some
lower layer (or the hardware), and thereby "heal" the bad blocks.

If the bitmap writeout errors out as well, we will (again: try to)
mark the "we need a full sync" bit in our super block,
if it was a READ error; writes are covered by the activity log already.

If that superblock does not make it to disk either, we are sorry.

Maybe we just lost an entire disk or controller (or iSCSI connection),
and there actually are no bad blocks at all, so we don't need to
re-fetch from the peer, there is no "auto-healing" necessary.

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

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index e307890e6afe..97a9e69dd239 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -492,11 +492,14 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
                 mod_rq_state(req, m, 0, RQ_LOCAL_ABORTED);
                 break;
 
+        case WRITE_COMPLETED_WITH_ERROR:
+                __drbd_chk_io_error(mdev, DRBD_WRITE_ERROR);
+                mod_rq_state(req, m, RQ_LOCAL_PENDING, RQ_LOCAL_COMPLETED);
+                break;
+
         case READ_COMPLETED_WITH_ERROR:
                 drbd_set_out_of_sync(mdev, req->i.sector, req->i.size);
-                /* fall through. */
-        case WRITE_COMPLETED_WITH_ERROR:
-                __drbd_chk_io_error(mdev, DRBD_IO_ERROR);
+                __drbd_chk_io_error(mdev, DRBD_READ_ERROR);
                 /* fall through. */
         case READ_AHEAD_COMPLETED_WITH_ERROR:
                 /* it is legal to fail READA, no __drbd_chk_io_error in that case. */