diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-01 05:08:28 -0500 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-10 05:48:16 -0500 |
commit | 7fde2be93080c028c20078a2d6abec8a95891192 (patch) | |
tree | 47993e3c52d550d22ab8035de94d526d226bc2e6 /drivers/block/drbd/drbd_receiver.c | |
parent | c5a91619793d444e5103ec5841045bf878718398 (diff) |
drbd: Implemented real timeout checking for request processing time
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_receiver.c')
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 3d62ac7cdc4a..fe1564c7d8b6 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -912,6 +912,7 @@ retry: | |||
912 | drbd_send_state(mdev); | 912 | drbd_send_state(mdev); |
913 | clear_bit(USE_DEGR_WFC_T, &mdev->flags); | 913 | clear_bit(USE_DEGR_WFC_T, &mdev->flags); |
914 | clear_bit(RESIZE_PENDING, &mdev->flags); | 914 | clear_bit(RESIZE_PENDING, &mdev->flags); |
915 | mod_timer(&mdev->request_timer, jiffies + HZ); /* just start it here. */ | ||
915 | 916 | ||
916 | return 1; | 917 | return 1; |
917 | 918 | ||
@@ -3822,6 +3823,8 @@ static void drbd_disconnect(struct drbd_conf *mdev) | |||
3822 | atomic_set(&mdev->rs_pending_cnt, 0); | 3823 | atomic_set(&mdev->rs_pending_cnt, 0); |
3823 | wake_up(&mdev->misc_wait); | 3824 | wake_up(&mdev->misc_wait); |
3824 | 3825 | ||
3826 | del_timer(&mdev->request_timer); | ||
3827 | |||
3825 | /* make sure syncer is stopped and w_resume_next_sg queued */ | 3828 | /* make sure syncer is stopped and w_resume_next_sg queued */ |
3826 | del_timer_sync(&mdev->resync_timer); | 3829 | del_timer_sync(&mdev->resync_timer); |
3827 | resync_timer_fn((unsigned long)mdev); | 3830 | resync_timer_fn((unsigned long)mdev); |