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>

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index bc8a8a7556da..4bd636524dd1 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1404,6 +1404,9 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
         /* Here we have the actions that are performed after a
            state change. This function might sleep */
 
+        if (os.disk <= D_NEGOTIATING && ns.disk > D_NEGOTIATING)
+                mod_timer(&mdev->request_timer, jiffies + HZ);
+
         nsm.i = -1;
         if (ns.susp_nod) {
                 if (os.conn < C_CONNECTED && ns.conn >= C_CONNECTED)
@@ -3318,6 +3321,8 @@ static void drbd_delete_device(unsigned int minor)
         if (!mdev)
                 return;
 
+        del_timer_sync(&mdev->request_timer);
+
         /* paranoia asserts */
         if (mdev->open_cnt != 0)
                 dev_err(DEV, "open_cnt = %d in %s:%u", mdev->open_cnt,