diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2010-10-14 13:37:40 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2010-10-14 19:08:58 +0200 |
| commit | 856c50c7b616d50e1a3ccd4ce35f7814650fa594 (patch) | |
| tree | 4ffcbe5f1ce700813516c6d73d188748366fe42a /drivers/block/drbd | |
| parent | 9d282875d85ebc2b49362310677fc0dcd91b9db9 (diff) | |
| download | blackbird-op-linux-856c50c7b616d50e1a3ccd4ce35f7814650fa594.tar.gz blackbird-op-linux-856c50c7b616d50e1a3ccd4ce35f7814650fa594.zip | |
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: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 5a4b6dcd48f2..6ec922c623a1 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3804,6 +3804,9 @@ static void drbdd(struct drbd_conf *mdev) err_out: 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) @@ -4685,10 +4688,12 @@ int drbd_asender(struct drbd_thread *thi) if (0) { reconnect: drbd_force_state(mdev, NS(conn, C_NETWORK_FAILURE)); + drbd_md_sync(mdev); } if (0) { disconnect: drbd_force_state(mdev, NS(conn, C_DISCONNECTING)); + drbd_md_sync(mdev); } clear_bit(SIGNAL_ASENDER, &mdev->flags); |
