Commit 856c50c7 authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Philipp Reisner

drbd: add some more explicit drbd_md_sync

It sometimes may take a while for the after state change work to be
scheduled, which does drbd_md_sync. At convenient places, we should do
explicit drbd_md_sync to have the new state information on disk as soon
as possible.
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 9d282875
...@@ -3804,6 +3804,9 @@ static void drbdd(struct drbd_conf *mdev) ...@@ -3804,6 +3804,9 @@ static void drbdd(struct drbd_conf *mdev)
err_out: err_out:
drbd_force_state(mdev, NS(conn, C_PROTOCOL_ERROR)); drbd_force_state(mdev, NS(conn, C_PROTOCOL_ERROR));
} }
/* If we leave here, we probably want to update at least the
* "Connected" indicator on stable storage. Do so explicitly here. */
drbd_md_sync(mdev);
} }
void drbd_flush_workqueue(struct drbd_conf *mdev) void drbd_flush_workqueue(struct drbd_conf *mdev)
...@@ -4685,10 +4688,12 @@ int drbd_asender(struct drbd_thread *thi) ...@@ -4685,10 +4688,12 @@ int drbd_asender(struct drbd_thread *thi)
if (0) { if (0) {
reconnect: reconnect:
drbd_force_state(mdev, NS(conn, C_NETWORK_FAILURE)); drbd_force_state(mdev, NS(conn, C_NETWORK_FAILURE));
drbd_md_sync(mdev);
} }
if (0) { if (0) {
disconnect: disconnect:
drbd_force_state(mdev, NS(conn, C_DISCONNECTING)); drbd_force_state(mdev, NS(conn, C_DISCONNECTING));
drbd_md_sync(mdev);
} }
clear_bit(SIGNAL_ASENDER, &mdev->flags); clear_bit(SIGNAL_ASENDER, &mdev->flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment