iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocfs2: don't use flush_scheduled_work()

Browse Source 
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>
This commit is contained in:
Tejun Heo 2010-12-24 15:59:06 +01:00
parent 7f6b0db9f6
commit 9b00a81829
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ocfs2/cluster/heartbeat.c
View File

@ -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(&reg->hr_write_timeout_work);
flush_scheduled_work();
cancel_delayed_work_sync(&reg->hr_write_timeout_work);
}
static inline void o2hb_bio_wait_init(struct o2hb_bio_wait_ctxt *wc)

4
fs/ocfs2/cluster/quorum.c
View File

@ -325,5 +325,7 @@ void o2quo_init(void)
void o2quo_exit(void)
{
flush_scheduled_work();
struct o2quo_state *qs = &o2quo_state;
flush_work_sync(&qs->qs_work);
}