ocfs2: o2hb: fix hb hung time

biger410 · torvalds · commit 6633ca573165 · 2016-05-27T14:49:37.000-07:00
hr_last_timeout_start should be set as the last time where hb is
still OK.  When hb write timeout, hung time will be (jiffies -
hr_last_timeout_start).

Signed-off-by: Junxiao Bi &lt;junxiao.bi@oracle.com&gt;
Reviewed-by: Ryan Ding &lt;ryan.ding@oracle.com&gt;
Reviewed-by: Mark Fasheh &lt;mfasheh@suse.de&gt;
Cc: Gang He &lt;ghe@suse.com&gt;
Cc: rwxybh &lt;rwxybh@126.com&gt;
Cc: Joel Becker &lt;jlbec@evilplan.org&gt;
Cc: Joseph Qi &lt;joseph.qi@huawei.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
@@ -356,7 +356,6 @@ static void o2hb_arm_timeout(struct o2hb_region *reg)
 		spin_unlock(&o2hb_live_lock);
 	}
 	cancel_delayed_work(&reg->hr_write_timeout_work);
-	reg->hr_last_timeout_start = jiffies;
 	schedule_delayed_work(&reg->hr_write_timeout_work,
 			      msecs_to_jiffies(O2HB_MAX_WRITE_TIMEOUT_MS));
 
@@ -1174,6 +1173,7 @@ static int o2hb_do_disk_heartbeat(struct o2hb_region *reg)
 	if (own_slot_ok) {
 		o2hb_set_quorum_device(reg);
 		o2hb_arm_timeout(reg);
+		reg->hr_last_timeout_start = jiffies;
 	}
 
 bail:

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,6 @@ static void o2hb_arm_timeout(struct o2hb_region *reg)`
`356`	`356`	`spin_unlock(&o2hb_live_lock);`
`357`	`357`	`}`
`358`	`358`	`cancel_delayed_work(&reg->hr_write_timeout_work);`
`359`		`- reg->hr_last_timeout_start = jiffies;`
`360`	`359`	`schedule_delayed_work(&reg->hr_write_timeout_work,`
`361`	`360`	`msecs_to_jiffies(O2HB_MAX_WRITE_TIMEOUT_MS));`
`362`	`361`
`@@ -1174,6 +1173,7 @@ static int o2hb_do_disk_heartbeat(struct o2hb_region *reg)`
`1174`	`1173`	`if (own_slot_ok) {`
`1175`	`1174`	`o2hb_set_quorum_device(reg);`
`1176`	`1175`	`o2hb_arm_timeout(reg);`
	`1176`	`+ reg->hr_last_timeout_start = jiffies;`
`1177`	`1177`	`}`
`1178`	`1178`
`1179`	`1179`	`bail:`