diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-01 11:08:28 +0100 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:45:07 +0100 |
| commit | 8b924f1d63ca969581afcbb198237643a38ecd0f (patch) | |
| tree | 7117983ad92c3ec9adf779eaf23f91c43e941977 /drivers/block | |
| parent | 706cb24c239bee5442c0b046abc7bf12f1aa0579 (diff) | |
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>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 1 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_req.c | 15 |
2 files changed, 9 insertions, 7 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 7bc7b098787a..9ad8dd3a8481 100644 --- 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 e296d7ed6b8f..fd0b4529a4b9 100644 --- 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); } |