Skip to content

Commit

Permalink
drbd: Eliminated the "notified peer" messages
Browse files Browse the repository at this point in the history
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
  • Loading branch information
Philipp Reisner committed Nov 8, 2012
1 parent 369bea6 commit a67e1d9
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/block/drbd/drbd_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit a67e1d9

Please sign in to comment.