summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2011-01-20 09:47:53 (GMT)
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-03-10 10:47:55 (GMT)
commit54b956abef2c1ab339fd01792e69e4a921a5e487 (patch)
treee489b7742b99e8cfda55d75dc4675d3f00c40af0 /drivers/block
parent194bfb32dba8345a7e0f83e9b1ee965e14d4b679 (diff)
downloadlinux-fsl-qoriq-54b956abef2c1ab339fd01792e69e4a921a5e487.tar.xz
drbd: don't pointlessly queue bitmap send, if we lost connection
This is a minor optimization and cleanup, and also considerably reduces some harmless (but noisy) race with the connection cleanup code. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_main.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 34ee8e4..1caced0 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1428,8 +1428,13 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
drbd_send_uuids(mdev);
drbd_send_state(mdev);
}
- if (os.conn != C_WF_BITMAP_S && ns.conn == C_WF_BITMAP_S)
- drbd_queue_bitmap_io(mdev, &drbd_send_bitmap, NULL, "send_bitmap (WFBitMapS)");
+ /* No point in queuing send_bitmap if we don't have a connection
+ * anymore, so check also the _current_ state, not only the new state
+ * at the time this work was queued. */
+ if (os.conn != C_WF_BITMAP_S && ns.conn == C_WF_BITMAP_S &&
+ mdev->state.conn == C_WF_BITMAP_S)
+ drbd_queue_bitmap_io(mdev, &drbd_send_bitmap, NULL,
+ "send_bitmap (WFBitMapS)");
/* Lost contact to peer's copy of the data */
if ((os.pdsk >= D_INCONSISTENT &&