aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-24 09:59:06 -0500
committerTejun Heo <tj@kernel.org>2010-12-24 09:59:06 -0500
commit9b00a8182987e8b7028d97c2bee3319ef383b57a (patch)
treed1b933db966352eb247e0712cab7e9594e93e3eb /fs/ocfs2
parent7f6b0db9f63ba423d989e29f6318fe7e68760421 (diff)
ocfs2: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed. * cancel_delayed_work() + flush_schedule_work() -> cancel_delayed_work_sync(). * flush qs->qs_work directly on exit instead. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Joel Becker <joel.becker@oracle.com> Cc: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/cluster/heartbeat.c3
-rw-r--r--fs/ocfs2/cluster/quorum.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 52c7557f3e25..892e2de49903 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
308static void o2hb_disarm_write_timeout(struct o2hb_region *reg) 308static void o2hb_disarm_write_timeout(struct o2hb_region *reg)
309{ 309{
310 cancel_delayed_work(&reg->hr_write_timeout_work); 310 cancel_delayed_work_sync(&reg->hr_write_timeout_work);
311 flush_scheduled_work();
312} 311}
313 312
314static inline void o2hb_bio_wait_init(struct o2hb_bio_wait_ctxt *wc) 313static inline void o2hb_bio_wait_init(struct o2hb_bio_wait_ctxt *wc)
diff --git a/fs/ocfs2/cluster/quorum.c b/fs/ocfs2/cluster/quorum.c
index cf3e16696216..a87366750f23 100644
--- a/fs/ocfs2/cluster/quorum.c
+++ b/fs/ocfs2/cluster/quorum.c
@@ -325,5 +325,7 @@ void o2quo_init(void)
325 325
326void o2quo_exit(void) 326void o2quo_exit(void)
327{ 327{
328 flush_scheduled_work(); 328 struct o2quo_state *qs = &o2quo_state;
329
330 flush_work_sync(&qs->qs_work);
329} 331}