diff options
| author | Philipp Reisner | 2011-02-09 14:10:32 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2011-09-28 10:33:16 +0200 |
| commit | 2a67d8b93b3363d4a5608d16d510a4bf6b3863fb (patch) | |
| tree | 1df36bd453029bf29dc5d4dbb97b6212f00736bb /drivers/block/drbd/drbd_worker.c | |
| parent | drbd: Generalized the work callbacks (diff) | |
| download | kernel-qcow2-linux-2a67d8b93b3363d4a5608d16d510a4bf6b3863fb.tar.gz kernel-qcow2-linux-2a67d8b93b3363d4a5608d16d510a4bf6b3863fb.tar.xz kernel-qcow2-linux-2a67d8b93b3363d4a5608d16d510a4bf6b3863fb.zip | |
drbd: Converted drbd_send_ping() and related functions from mdev to tconn
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_worker.c')
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 418f44ad9a86..8539df25bc22 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@ -730,10 +730,12 @@ static int w_resync_finished(struct drbd_work *w, int cancel) static void ping_peer(struct drbd_conf *mdev) { - clear_bit(GOT_PING_ACK, &mdev->flags); - request_ping(mdev->tconn); - wait_event(mdev->misc_wait, - test_bit(GOT_PING_ACK, &mdev->flags) || mdev->state.conn < C_CONNECTED); + struct drbd_tconn *tconn = mdev->tconn; + + clear_bit(GOT_PING_ACK, &tconn->flags); + request_ping(tconn); + wait_event(tconn->ping_wait, + test_bit(GOT_PING_ACK, &tconn->flags) || mdev->state.conn < C_CONNECTED); } int drbd_resync_finished(struct drbd_conf *mdev) |