From 88a0429264089c9612d6ccca57d462ed42fd3425 Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Wed, 2 Nov 2011 16:29:45 +0100 Subject: [PATCH] --- yaml --- r: 309325 b: refs/heads/master c: 763eb63625a625e4d160cbb4cce2bcdb40141b97 h: refs/heads/master i: 309323: 0872dc9206c280e6cbc10e4ba4a75ce6b7dc3c4b v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_actlog.c | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index b707a0e396c6..1f2e0a019f7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e89868a0927cfb8a3f535c938e5d6dd7edc6353c +refs/heads/master: 763eb63625a625e4d160cbb4cce2bcdb40141b97 diff --git a/trunk/drivers/block/drbd/drbd_actlog.c b/trunk/drivers/block/drbd/drbd_actlog.c index 3d7c2153daca..601ad9ef0437 100644 --- a/trunk/drivers/block/drbd/drbd_actlog.c +++ b/trunk/drivers/block/drbd/drbd_actlog.c @@ -711,16 +711,20 @@ static void drbd_try_clear_on_disk_bm(struct drbd_conf *mdev, sector_t sector, else ext->rs_failed += count; if (ext->rs_left < ext->rs_failed) { - dev_err(DEV, "BAD! sector=%llus enr=%u rs_left=%d " - "rs_failed=%d count=%d\n", + dev_warn(DEV, "BAD! sector=%llus enr=%u rs_left=%d " + "rs_failed=%d count=%d cstate=%s\n", (unsigned long long)sector, ext->lce.lc_number, ext->rs_left, - ext->rs_failed, count); - dump_stack(); - - lc_put(mdev->resync, &ext->lce); - drbd_force_state(mdev, NS(conn, C_DISCONNECTING)); - return; + ext->rs_failed, count, + drbd_conn_str(mdev->state.conn)); + + /* We don't expect to be able to clear more bits + * than have been set when we originally counted + * the set bits to cache that value in ext->rs_left. + * Whatever the reason (disconnect during resync, + * delayed local completion of an application write), + * try to fix it up by recounting here. */ + ext->rs_left = drbd_bm_e_weight(mdev, enr); } } else { /* Normally this element should be in the cache,