diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-06-29 16:06:08 +0400 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-05-09 17:10:45 +0400 |
| commit | dfa8bedbfe881caf6676704ab1aae18dfe8e430a (patch) | |
| tree | 416102d8cd59c6be45b072c2ce123c6cb8f63f52 /drivers/block/drbd/drbd_receiver.c | |
| parent | 02ee8f95fadf7c94b3d28df436a095152f6392b2 (diff) | |
| download | linux-dfa8bedbfe881caf6676704ab1aae18dfe8e430a.tar.xz | |
drbd: Implemented the disk-timeout option
When the disk-timeout is active, and it expires for a single request,
we consider the local disk as D_FAILED. Note: With this change,
I made both timeout based state transitions HARD state transitions.
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 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index e7ed0aa93a16..a85bbe1bbc2b 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3803,8 +3803,6 @@ static void drbd_disconnect(struct drbd_conf *mdev) atomic_set(&mdev->rs_pending_cnt, 0); wake_up(&mdev->misc_wait); - del_timer(&mdev->request_timer); - /* make sure syncer is stopped and w_resume_next_sg queued */ del_timer_sync(&mdev->resync_timer); resync_timer_fn((unsigned long)mdev); |