From 41f7f209e8a82d6a8eb9cba6cab739aa150f3623 Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Thu, 14 Oct 2010 13:37:40 +0200 Subject: [PATCH] --- yaml --- r: 213163 b: refs/heads/master c: 856c50c7b616d50e1a3ccd4ce35f7814650fa594 h: refs/heads/master i: 213161: 58a22a09bb51b2c29a4748c1cccf36f487e7a3d4 213159: f190a94c004ffdf50e0a5dbb5e27849856692028 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fcd98f333292..32546c186009 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d282875d85ebc2b49362310677fc0dcd91b9db9 +refs/heads/master: 856c50c7b616d50e1a3ccd4ce35f7814650fa594 diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 5a4b6dcd48f2..6ec922c623a1 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/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);