Skip to content

Commit

Permalink
tty_ldisc: don't use flush_scheduled_work()
Browse files Browse the repository at this point in the history
flush_scheduled_work() is scheduled to be deprecated.  Explicitly sync
flush the used work items instead.  Note that before this change,
flush_scheduled_work() wouldn't have properly flushed tty->buf.work if
it were on timer.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Tejun Heo authored and Greg Kroah-Hartman committed Feb 3, 2011
1 parent 7884146 commit 0a1f1a0
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions drivers/tty/tty_ldisc.c
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,19 @@ static int tty_ldisc_halt(struct tty_struct *tty)
return cancel_delayed_work_sync(&tty->buf.work);
}

/**
* tty_ldisc_flush_works - flush all works of a tty
* @tty: tty device to flush works for
*
* Sync flush all works belonging to @tty.
*/
static void tty_ldisc_flush_works(struct tty_struct *tty)
{
flush_work_sync(&tty->hangup_work);
flush_work_sync(&tty->SAK_work);
flush_delayed_work_sync(&tty->buf.work);
}

/**
* tty_ldisc_wait_idle - wait for the ldisc to become idle
* @tty: tty to wait for
Expand Down Expand Up @@ -653,7 +666,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)

mutex_unlock(&tty->ldisc_mutex);

flush_scheduled_work();
tty_ldisc_flush_works(tty);

retval = tty_ldisc_wait_idle(tty);

Expand Down Expand Up @@ -905,7 +918,7 @@ void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty)

tty_unlock();
tty_ldisc_halt(tty);
flush_scheduled_work();
tty_ldisc_flush_works(tty);
tty_lock();

mutex_lock(&tty->ldisc_mutex);
Expand Down

0 comments on commit 0a1f1a0

Please sign in to comment.