---

yaml --- r: 346115 b: refs/heads/master c: 3b03ad5 h: refs/heads/master i: 346113: f3854ad 346111: d15aff1 v: v3
git-mirror · Nov 8, 2012 · 12a602d · 12a602d
1 parent cbb25fb
commit 12a602d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fb4746d8d3f9c3e48f7fc65ed24bc54bb8032aa
+refs/heads/master: 3b03ad5929e3ba5e1c3db7a70d426f883be061c2
diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c
@@ -1083,7 +1083,7 @@ void request_timer_fn(unsigned long data)
 	struct drbd_request *req; /* oldest request */
 	struct list_head *le;
 	struct net_conf *nc;
-	unsigned long ent = 0, dt = 0, et; /* effective timeout = ko_count * timeout */
+	unsigned long ent = 0, dt = 0, et, nt; /* effective timeout = ko_count * timeout */
 
 	rcu_read_lock();
 	nc = rcu_dereference(tconn->net_conf);
@@ -1122,6 +1122,7 @@ void request_timer_fn(unsigned long data)
 			__drbd_chk_io_error(mdev, 1);
 		}
 	}
+	nt = (time_is_before_eq_jiffies(req->start_time + et) ? jiffies : req->start_time) + et;
 	spin_unlock_irq(&tconn->req_lock);
-	mod_timer(&mdev->request_timer, req->start_time + et);
+	mod_timer(&mdev->request_timer, nt);
 }