diff options
Diffstat (limited to 'fs/ocfs2/cluster/heartbeat.c')
-rw-r--r-- | fs/ocfs2/cluster/heartbeat.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index 9f26ac9be2a4..9e3d45bcb5fd 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c | |||
@@ -307,8 +307,7 @@ static void o2hb_arm_write_timeout(struct o2hb_region *reg) | |||
307 | 307 | ||
308 | static void o2hb_disarm_write_timeout(struct o2hb_region *reg) | 308 | static void o2hb_disarm_write_timeout(struct o2hb_region *reg) |
309 | { | 309 | { |
310 | cancel_delayed_work(®->hr_write_timeout_work); | 310 | cancel_delayed_work_sync(®->hr_write_timeout_work); |
311 | flush_scheduled_work(); | ||
312 | } | 311 | } |
313 | 312 | ||
314 | static inline void o2hb_bio_wait_init(struct o2hb_bio_wait_ctxt *wc) | 313 | static inline void o2hb_bio_wait_init(struct o2hb_bio_wait_ctxt *wc) |