iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drbd: Use tconn in request_timer_fn()

Browse Source 
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Philipp Reisner 2011-03-01 11:08:28 +01:00
parent 706cb24c23
commit 8b924f1d63
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/block/drbd/drbd_receiver.c
View File

@ -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;
}

15
drivers/block/drbd/drbd_req.c
View File

@ -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);
}