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@citrix.com>
linux-2.6.18-xen changeset:   497:fdb998e79aba45e27948047f680bf70ca5dddbd9
linux-2.6.18-xen date:        Fri Mar 28 09:44:51 2008 +0000

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
index e2f6b5809be8eec491aeb14562a41471095cbbcc..9d6d364d998690f3c2546069e742b9d2942a4e97 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
@@ -807,7 +807,7 @@ static void blkif_recover(struct blkfront_info *info)
        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. */