Patch "xen-blkback: replace work_pending with work_busy in purge_persistent_gnt()" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

xen-blkback: replace work_pending with work_busy in purge_persistent_gnt()

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
xen-blkback-replace-work_pending-with-work_busy-in-purge_persistent_gnt.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Bob Liu <[email protected]>
Date: Wed, 22 Jul 2015 14:40:10 +0800
Subject: xen-blkback: replace work_pending with work_busy in purge_persistent_gnt()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Bob Liu <[email protected]>

commit 53bc7dc004fecf39e0ba70f2f8d120a1444315d3 upstream.

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.

---
 drivers/block/xen-blkback/blkback.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

@@ -362,8 +362,8 @@ static void purge_persistent_gnt(struct
 		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;
 	}
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/xen-blkback-replace-work_pending-with-work_busy-in-purge_persistent_gnt.patch queue-4.1/xen-blkfront-don-t-add-indirect-pages-to-list-when.patch