diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-02-07 08:49:19 -0500 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-09-28 04:26:58 -0400 |
commit | 0625ac190d222fd0855bad79e93f1556fc45dd20 (patch) | |
tree | 3c2727aeae2792ca6877b8d1922a7d5d1b9f27ca /drivers/block/drbd/drbd_worker.c | |
parent | 808e37b803958e09494e0c7de492386845060057 (diff) |
drbd: Converted wake_asender() and request_ping() 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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index a705979c71f8..5be179ba0c76 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c | |||
@@ -145,7 +145,7 @@ static void drbd_endio_write_sec_final(struct drbd_peer_request *peer_req) __rel | |||
145 | if (do_al_complete_io) | 145 | if (do_al_complete_io) |
146 | drbd_al_complete_io(mdev, e_sector); | 146 | drbd_al_complete_io(mdev, e_sector); |
147 | 147 | ||
148 | wake_asender(mdev); | 148 | wake_asender(mdev->tconn); |
149 | put_ldev(mdev); | 149 | put_ldev(mdev); |
150 | } | 150 | } |
151 | 151 | ||
@@ -728,7 +728,7 @@ static int w_resync_finished(struct drbd_conf *mdev, struct drbd_work *w, int ca | |||
728 | static void ping_peer(struct drbd_conf *mdev) | 728 | static void ping_peer(struct drbd_conf *mdev) |
729 | { | 729 | { |
730 | clear_bit(GOT_PING_ACK, &mdev->flags); | 730 | clear_bit(GOT_PING_ACK, &mdev->flags); |
731 | request_ping(mdev); | 731 | request_ping(mdev->tconn); |
732 | wait_event(mdev->misc_wait, | 732 | wait_event(mdev->misc_wait, |
733 | test_bit(GOT_PING_ACK, &mdev->flags) || mdev->state.conn < C_CONNECTED); | 733 | test_bit(GOT_PING_ACK, &mdev->flags) || mdev->state.conn < C_CONNECTED); |
734 | } | 734 | } |