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

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1206697491 0
# Node ID fdb998e79aba45e27948047f680bf70ca5dddbd9
# Parent  a8f250d8a3e92a387f63b07180b228069446150b
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>
---
 drivers/xen/blkfront/blkfront.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r a8f250d8a3e9 -r fdb998e79aba drivers/xen/blkfront/blkfront.c
--- a/drivers/xen/blkfront/blkfront.c   Thu Mar 27 17:56:50 2008 +0000
+++ b/drivers/xen/blkfront/blkfront.c   Fri Mar 28 09:44:51 2008 +0000
@@ -817,7 +817,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