mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
xen: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush info->work instead. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
parent
0ead5c86ac
commit
30d65030fd
1 changed files with 2 additions and 2 deletions
|
@ -538,7 +538,7 @@ static void xlvbd_release_gendisk(struct blkfront_info *info)
|
||||||
spin_unlock_irqrestore(&blkif_io_lock, flags);
|
spin_unlock_irqrestore(&blkif_io_lock, flags);
|
||||||
|
|
||||||
/* Flush gnttab callback work. Must be done with no locks held. */
|
/* Flush gnttab callback work. Must be done with no locks held. */
|
||||||
flush_scheduled_work();
|
flush_work_sync(&info->work);
|
||||||
|
|
||||||
del_gendisk(info->gd);
|
del_gendisk(info->gd);
|
||||||
|
|
||||||
|
@ -587,7 +587,7 @@ static void blkif_free(struct blkfront_info *info, int suspend)
|
||||||
spin_unlock_irq(&blkif_io_lock);
|
spin_unlock_irq(&blkif_io_lock);
|
||||||
|
|
||||||
/* Flush gnttab callback work. Must be done with no locks held. */
|
/* Flush gnttab callback work. Must be done with no locks held. */
|
||||||
flush_scheduled_work();
|
flush_work_sync(&info->work);
|
||||||
|
|
||||||
/* Free resources associated with old device channel. */
|
/* Free resources associated with old device channel. */
|
||||||
if (info->ring_ref != GRANT_INVALID_REF) {
|
if (info->ring_ref != GRANT_INVALID_REF) {
|
||||||
|
|
Loading…
Reference in a new issue