From f07c5d53814b5cfc1e9c07bb9ea14929667635b4 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Tue, 13 Dec 2011 10:31:32 +0100 Subject: [PATCH] --- yaml --- r: 309327 b: refs/heads/master c: 4afc433cf8066c112bd2bdd949d78ff8e8b4ba3f h: refs/heads/master i: 309325: 88a0429264089c9612d6ccca57d462ed42fd3425 309323: 0872dc9206c280e6cbc10e4ba4a75ce6b7dc3c4b 309319: 09b12ced426eae4040b0b8051828e781bb5b8a56 309311: ed54160b2969c9aa0ee4e1b53e19f5d091d52416 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d001b1a3436a..188146cc256b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 545752d5d8a2e01b4fcb23a61ec732b2b26cbe1a +refs/heads/master: 4afc433cf8066c112bd2bdd949d78ff8e8b4ba3f diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index f71a667f5f32..b2c0e5f0d52c 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/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 */