From: Bob Liu Date: Wed, 22 Jul 2015 06:40:10 +0000 (+0800) Subject: xen-blkback: replace work_pending with work_busy in purge_persistent_gnt() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=53bc7dc004fecf39e0ba70f2f8d120a1444315d3;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git xen-blkback: replace work_pending with work_busy in purge_persistent_gnt() The BUG_ON() in purge_persistent_gnt() will be triggered when previous purge work haven't finished. There is a work_pending() before this BUG_ON, but it doesn't account if the work is still currently running. CC: stable@vger.kernel.org Acked-by: Roger Pau Monné Signed-off-by: Bob Liu Signed-off-by: Konrad Rzeszutek Wilk --- diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c index 9121a2c3e26f..73c04040c8c8 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -382,8 +382,8 @@ static void purge_persistent_gnt(struct xen_blkif *blkif) return; } - if (work_pending(&blkif->persistent_purge_work)) { - pr_alert_ratelimited("Scheduled work from previous purge is still pending, cannot purge list\n"); + if (work_busy(&blkif->persistent_purge_work)) { + pr_alert_ratelimited("Scheduled work from previous purge is still busy, cannot purge list\n"); return; }