---

yaml --- r: 346101 b: refs/heads/master c: a67e1d9 h: refs/heads/master i: 346099: 1d1bcaa v: v3
git-mirror · Nov 8, 2012 · ba6349a · ba6349a
1 parent 00f95e7
commit ba6349a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 369bea63711ae0595f6ef8c3c02bbf8a17ec608a
+refs/heads/master: a67e1d9e8cca5e05f03a6f45c3220c6fe3adfa95
diff --git a/trunk/drivers/block/drbd/drbd_state.c b/trunk/drivers/block/drbd/drbd_state.c
@@ -1333,9 +1333,7 @@ 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))
-			dev_info(DEV, "Notified peer that I am detaching my disk\n");
-
+		drbd_send_state(mdev);
 		drbd_rs_cancel_all(mdev);
 
 		/* In case we want to get something to stable storage still,
@@ -1363,8 +1361,7 @@ 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))
-			dev_info(DEV, "Notified peer that I'm now diskless.\n");
+		drbd_send_state(mdev);
 		/* corresponding get_ldev in __drbd_set_state
 		 * this may finally trigger drbd_ldev_destroy. */
 		put_ldev(mdev);