[Xen-changelog] [xen-3.1-testing] Avoid another allocation on the resume path which can lead to deadlock

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1206978497 -3600
# Node ID 456421041d9ab8ae56ee28b8e0228fd44f10837e
# Parent  cb280d3f032b0324ae8a4e2730b225e82991ae7c
Avoid another allocation on the resume path which can lead to deadlock
if the swap device isn't present yet.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
linux-2.6.18-xen changeset:   497:fdb998e79aba45e27948047f680bf70ca5dddbd9
linux-2.6.18-xen date:        Fri Mar 28 09:44:51 2008 +0000
---
 linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r cb280d3f032b -r 456421041d9a 
linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c      Mon Mar 31 
16:47:53 2008 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c      Mon Mar 31 
16:48:17 2008 +0100
@@ -807,7 +807,7 @@ static void blkif_recover(struct blkfron
        int j;
 
        /* Stage 1: Make a safe copy of the shadow state. */
-       copy = kmalloc(sizeof(info->shadow), GFP_KERNEL | __GFP_NOFAIL);
+       copy = kmalloc(sizeof(info->shadow), GFP_KERNEL | __GFP_NOFAIL | 
__GFP_HIGH);
        memcpy(copy, info->shadow, sizeof(info->shadow));
 
        /* Stage 2: Set up free list. */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog