Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b00a818 authored by Tejun Heo's avatar Tejun Heo
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarJoel Becker <joel.becker@oracle.com>
Cc: Mark Fasheh <mfasheh@suse.com>
parent 7f6b0db9

fs/ocfs2/cluster/heartbeat.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

fs/ocfs2/cluster/quorum.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

}