aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_receiver.c
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2010-12-27 04:53:28 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-03-10 05:45:25 -0500
commitd612d309e4c8401ad94c531678b59c4a8b7c41ce (patch)
treea50d72c0d2a92701df76e7e6effd96781728f600 /drivers/block/drbd/drbd_receiver.c
parent617049aa7d753e8c821ac77126ab90e9f1b66d6d (diff)
drbd: No longer answer P_RS_DATA_REQUEST packets when in C_AHEAD mode
When the sync source node replies to a P_RS_DATA_REQUEST packet when it is already in ahead mode. I.e. those two packets crossed each other on the wire, that may lead to diverging bitmaps. This never happens in a well-tuned-system. In a well-tuned- system the resync controller has reduced the resync speed to zero long before we got into ahead-mode. But we have to be prepared for the not-well-tuned-system of course as well. Because -> diverging bitmaps = non terminating resync. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
-rw-r--r--drivers/block/drbd/drbd_receiver.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index f0a0f66fbe68..bf865bd83414 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -4361,7 +4361,16 @@ static int got_NegRSDReply(struct drbd_conf *mdev, struct p_header80 *h)
4361 4361
4362 if (get_ldev_if_state(mdev, D_FAILED)) { 4362 if (get_ldev_if_state(mdev, D_FAILED)) {
4363 drbd_rs_complete_io(mdev, sector); 4363 drbd_rs_complete_io(mdev, sector);
4364 drbd_rs_failed_io(mdev, sector, size); 4364 switch (be16_to_cpu(h->command)) {
4365 case P_NEG_RS_DREPLY:
4366 drbd_rs_failed_io(mdev, sector, size);
4367 case P_RS_CANCEL:
4368 break;
4369 default:
4370 D_ASSERT(0);
4371 put_ldev(mdev);
4372 return false;
4373 }
4365 put_ldev(mdev); 4374 put_ldev(mdev);
4366 } 4375 }
4367 4376
@@ -4459,6 +4468,7 @@ static struct asender_cmd *get_asender_cmd(int cmd)
4459 [P_STATE_CHG_REPLY] = { sizeof(struct p_req_state_reply), got_RqSReply }, 4468 [P_STATE_CHG_REPLY] = { sizeof(struct p_req_state_reply), got_RqSReply },
4460 [P_RS_IS_IN_SYNC] = { sizeof(struct p_block_ack), got_IsInSync }, 4469 [P_RS_IS_IN_SYNC] = { sizeof(struct p_block_ack), got_IsInSync },
4461 [P_DELAY_PROBE] = { sizeof(struct p_delay_probe93), got_skip }, 4470 [P_DELAY_PROBE] = { sizeof(struct p_delay_probe93), got_skip },
4471 [P_RS_CANCEL] = { sizeof(struct p_block_ack), got_NegRSDReply},
4462 [P_MAX_CMD] = { 0, NULL }, 4472 [P_MAX_CMD] = { 0, NULL },
4463 }; 4473 };
4464 if (cmd > P_MAX_CMD || asender_tbl[cmd].process == NULL) 4474 if (cmd > P_MAX_CMD || asender_tbl[cmd].process == NULL)