Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 309296
b: refs/heads/master
c: 0766734
h: refs/heads/master
v: v3
  • Loading branch information
Lars Ellenberg authored and Philipp Reisner committed May 9, 2012
1 parent 86e0395 commit 4f90403
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 071cf1c9a7043660be08358e4b508f62120f224b
refs/heads/master: 07667347c89e5d971243a411ca4ed83ad14f9f9e
6 changes: 2 additions & 4 deletions trunk/drivers/block/drbd/drbd_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1530,9 +1530,7 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
drbd_disk_str(mdev->state.disk));

if (drbd_send_state(mdev))
dev_warn(DEV, "Notified peer that I am detaching my disk\n");
else
dev_err(DEV, "Sending state for detaching disk failed\n");
dev_info(DEV, "Notified peer that I am detaching my disk\n");

drbd_rs_cancel_all(mdev);

Expand Down Expand Up @@ -1562,7 +1560,7 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
atomic_set(&mdev->rs_pending_cnt, 0);

if (drbd_send_state(mdev))
dev_warn(DEV, "Notified peer that I'm now diskless.\n");
dev_info(DEV, "Notified peer that I'm now diskless.\n");
/* corresponding get_ldev in __drbd_set_state
* this may finally trigger drbd_ldev_destroy. */
put_ldev(mdev);
Expand Down

0 comments on commit 4f90403

Please sign in to comment.