diff options
author | Tejun Heo <tj@kernel.org> | 2010-12-24 15:59:06 +0100 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-12-24 15:59:06 +0100 |
commit | 9b00a8182987e8b7028d97c2bee3319ef383b57a (patch) | |
tree | d1b933db966352eb247e0712cab7e9594e93e3eb /fs/ocfs2/cluster/heartbeat.c | |
parent | 7f6b0db9f63ba423d989e29f6318fe7e68760421 (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/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 52c7557f3e2..892e2de4990 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) static void o2hb_disarm_write_timeout(struct o2hb_region *reg) { - cancel_delayed_work(®->hr_write_timeout_work); - flush_scheduled_work(); + cancel_delayed_work_sync(®->hr_write_timeout_work); } static inline void o2hb_bio_wait_init(struct o2hb_bio_wait_ctxt *wc) |