diff options
| author | Jens Axboe <axboe@fb.com> | 2015-07-27 20:58:41 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-07-27 20:58:41 +0300 |
| commit | e162b219ae6a64be353f254bd4ba1c9627c67749 (patch) | |
| tree | ec048447cd9a28f5a4a73b8f2ea76289acdbf8d7 /drivers/block/xen-blkback | |
| parent | cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f (diff) | |
| parent | 53bc7dc004fecf39e0ba70f2f8d120a1444315d3 (diff) | |
| download | linux-e162b219ae6a64be353f254bd4ba1c9627c67749.tar.xz | |
Merge branch 'stable/for-jens-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Konrad writes:
"There are three bugs that have been found in the xen-blkfront (and
backend). Two of them have the stable tree CC-ed. They have been found
where an guest is migrating to a host that is missing
'feature-persistent' support (from one that has it enabled). We end up
hitting an BUG() in the driver code."
Diffstat (limited to 'drivers/block/xen-blkback')
| -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 ced96777b677..954c0029fb3b 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -369,8 +369,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; } |