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>

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 33882c82b1acf51633f00d3642562d7c0b18a5ae..0b2962c623a849e2738d4341b7d7f25dc8392fcd 100644 (file)
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -1858,16 +1858,16 @@ drbd_queue_work(struct drbd_work_queue *q, struct drbd_work *w)
        spin_unlock_irqrestore(&q->q_lock, flags);
 }
 
-static inline void wake_asender(struct drbd_conf *mdev)
+static inline void wake_asender(struct drbd_tconn *tconn)
 {
-       if (test_bit(SIGNAL_ASENDER, &mdev->tconn->flags))
-               force_sig(DRBD_SIG, mdev->tconn->asender.task);
+       if (test_bit(SIGNAL_ASENDER, &tconn->flags))
+               force_sig(DRBD_SIG, tconn->asender.task);
 }
 
-static inline void request_ping(struct drbd_conf *mdev)
+static inline void request_ping(struct drbd_tconn *tconn)
 {
-       set_bit(SEND_PING, &mdev->tconn->flags);
-       wake_asender(mdev);
+       set_bit(SEND_PING, &tconn->flags);
+       wake_asender(tconn);
 }
 
 static inline int drbd_send_short_cmd(struct drbd_conf *mdev,

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 8b443c8b13b3f98d653f399a79f673d2b9c8b1c4..899bbb1c9865de79f1f555fdb608d565b8d61990 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1348,7 +1348,7 @@ static int we_should_drop_the_connection(struct drbd_conf *mdev, struct socket *
        if (!drop_it) {
                dev_err(DEV, "[%s/%d] sock_sendmsg time expired, ko = %u\n",
                       current->comm, current->pid, mdev->tconn->ko_count);
-               request_ping(mdev);
+               request_ping(mdev->tconn);
        }
 
        return drop_it; /* && (mdev->state == R_PRIMARY) */;

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index fda399ace8dd5e6e880fbb2cee856836c2d39279..df36a573cd47c73c439e8564cbb198ce1f135d8b 100644 (file)
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -318,7 +318,7 @@ drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role, int force)
        enum drbd_disk_state nps;
 
        if (new_role == R_PRIMARY)
-               request_ping(mdev); /* Detect a dead peer ASAP */
+               request_ping(mdev->tconn); /* Detect a dead peer ASAP */
 
        mutex_lock(&mdev->state_mutex);
 

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index b4c357e4ad8233784ba7ede9c91bc2e2e0574ada..a5234f99de021c92d7126a6b7e25acdfe1a02339 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -1864,7 +1864,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packet cmd,
                                 * but I don't like the receiver using the msock */
 
                                put_ldev(mdev);
-                               wake_asender(mdev);
+                               wake_asender(mdev->tconn);
                                finish_wait(&mdev->misc_wait, &wait);
                                return true;
                        }

diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index a705979c71f89cc4e3fd322842a2c42995e0ac33..5be179ba0c76d48d24572a703f3a7cff32526ca2 100644 (file)
--- 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
        if (do_al_complete_io)
                drbd_al_complete_io(mdev, e_sector);
 
-       wake_asender(mdev);
+       wake_asender(mdev->tconn);
        put_ldev(mdev);
 }
 
@@ -728,7 +728,7 @@ static int w_resync_finished(struct drbd_conf *mdev, struct drbd_work *w, int ca
 static void ping_peer(struct drbd_conf *mdev)
 {
        clear_bit(GOT_PING_ACK, &mdev->flags);
-       request_ping(mdev);
+       request_ping(mdev->tconn);
        wait_event(mdev->misc_wait,
                   test_bit(GOT_PING_ACK, &mdev->flags) || mdev->state.conn < C_CONNECTED);
 }