diff options
| author |   Bob Liu <bob.liu@oracle.com> | 2015-07-22 14:40:10 +0800 |
|---|---|---|
| committer |   Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2015-07-24 09:09:49 -0400 |
| commit | 53bc7dc004fecf39e0ba70f2f8d120a1444315d3 (patch) | |
| tree | b942ee542b05325f08b47647b4a55c956205e7cb /drivers/block | |
| parent | xen-blkfront: don't add indirect pages to list when !feature_persistent (diff) | |
| download | linux-dev-53bc7dc004fecf39e0ba70f2f8d120a1444315d3.tar.xz linux-dev-53bc7dc004fecf39e0ba70f2f8d120a1444315d3.zip | |
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é <roger.pau@citrix.com>
Signed-off-by: Bob Liu <bob.liu@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/xen-blkback/blkback.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |