drbd: Use tconn in request_timer_fn()

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_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 7bc7b09..9ad8dd3 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -794,6 +794,7 @@ int drbd_connected(int vnr, void *p, void *data)
                err = drbd_send_state(mdev);
        clear_bit(USE_DEGR_WFC_T, &mdev->flags);
        clear_bit(RESIZE_PENDING, &mdev->flags);
+       mod_timer(&mdev->request_timer, jiffies + HZ); /* just start it here. */
        return err;
 }
 

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index e296d7e..fd0b452 100644 (file)
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1047,21 +1047,22 @@ int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct
 void request_timer_fn(unsigned long data)
 {
        struct drbd_conf *mdev = (struct drbd_conf *) data;
+       struct drbd_tconn *tconn = mdev->tconn;
        struct drbd_request *req; /* oldest request */
        struct list_head *le;
        unsigned long et = 0; /* effective timeout = ko_count * timeout */
 
-       if (get_net_conf(mdev->tconn)) {
-               et = mdev->tconn->net_conf->timeout*HZ/10 * mdev->tconn->net_conf->ko_count;
-               put_net_conf(mdev->tconn);
+       if (get_net_conf(tconn)) {
+               et = tconn->net_conf->timeout*HZ/10 * tconn->net_conf->ko_count;
+               put_net_conf(tconn);
        }
        if (!et || mdev->state.conn < C_WF_REPORT_PARAMS)
                return; /* Recurring timer stopped */
 
-       spin_lock_irq(&mdev->tconn->req_lock);
-       le = &mdev->tconn->oldest_tle->requests;
+       spin_lock_irq(&tconn->req_lock);
+       le = &tconn->oldest_tle->requests;
        if (list_empty(le)) {
-               spin_unlock_irq(&mdev->tconn->req_lock);
+               spin_unlock_irq(&tconn->req_lock);
                mod_timer(&mdev->request_timer, jiffies + et);
                return;
        }
@@ -1080,5 +1081,5 @@ void request_timer_fn(unsigned long data)
                mod_timer(&mdev->request_timer, req->start_time + et);
        }
 
-       spin_unlock_irq(&mdev->tconn->req_lock);
+       spin_unlock_irq(&tconn->req_lock);
 }