Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

Tejun Heo 9b00a818 7f6b0db9

+4 -3
+1 -2
fs/ocfs2/cluster/heartbeat.c
··· 307 307 308 308 static void o2hb_disarm_write_timeout(struct o2hb_region *reg) 309 309 { 310 - cancel_delayed_work(&reg->hr_write_timeout_work); 311 - flush_scheduled_work(); 310 + cancel_delayed_work_sync(&reg->hr_write_timeout_work); 312 311 } 313 312 314 313 static inline void o2hb_bio_wait_init(struct o2hb_bio_wait_ctxt *wc)
+3 -1
fs/ocfs2/cluster/quorum.c
··· 325 325 326 326 void 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 }