diff options
| author | Philipp Reisner | 2011-12-13 10:31:32 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2012-05-09 15:16:29 +0200 |
| commit | 4afc433cf8066c112bd2bdd949d78ff8e8b4ba3f (patch) | |
| tree | 2919bdbaf204cb54b489988d1af2101f8d320af4 /drivers/block/drbd/drbd_main.c | |
| parent | drbd: fix race between disconnect and receive_state (diff) | |
| download | kernel-qcow2-linux-4afc433cf8066c112bd2bdd949d78ff8e8b4ba3f.tar.gz kernel-qcow2-linux-4afc433cf8066c112bd2bdd949d78ff8e8b4ba3f.tar.xz kernel-qcow2-linux-4afc433cf8066c112bd2bdd949d78ff8e8b4ba3f.zip | |
drbd: Do not send state packets while lower than C_CONNECTED cstate
I.e. in C_WF_REPORT_PARAMS or in C_WF_CONNECTION.
Sending may already work in these cstates, but the peer still expects
the HandShake / ConnectionFeatures packet.
Actually triggered by the Testuite on kugel.
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_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index f71a667f5f32..b2c0e5f0d52c 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -1612,8 +1612,8 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, "ASSERT FAILED: disk is %s during detach\n", drbd_disk_str(mdev->state.disk)); - if (drbd_send_state(mdev, ns)) - dev_info(DEV, "Notified peer that I am detaching my disk\n"); + if (ns.conn >= C_CONNECTED) + drbd_send_state(mdev, ns); drbd_rs_cancel_all(mdev); @@ -1642,15 +1642,16 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, mdev->rs_failed = 0; atomic_set(&mdev->rs_pending_cnt, 0); - if (drbd_send_state(mdev, ns)) - dev_info(DEV, "Notified peer that I'm now diskless.\n"); + if (ns.conn >= C_CONNECTED) + drbd_send_state(mdev, ns); + /* corresponding get_ldev in __drbd_set_state * this may finally trigger drbd_ldev_destroy. */ put_ldev(mdev); } /* Notify peer that I had a local IO error, and did not detached.. */ - if (os.disk == D_UP_TO_DATE && ns.disk == D_INCONSISTENT) + if (os.disk == D_UP_TO_DATE && ns.disk == D_INCONSISTENT && ns.conn >= C_CONNECTED) drbd_send_state(mdev, ns); /* Disks got bigger while they were detached */ |