From 58552766b7ab30f5f4ff0d5d0cd5163de8bcb98f Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 1 Mar 2011 16:26:10 -0500
Subject: [PATCH] --- yaml --- r: 251219 b: refs/heads/master c:
 464fb419e17083a18b636c9f4714fc49ef6857d2 h: refs/heads/master i:   251217:
 b04a0f8ded42c10fb53659dfba7694f3f07bf1d6   251215:
 a2e826e84df83c889b712a74f479d5f04d2c996d v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/xen/blkback/blkback.c | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 1f375332ecf3..578c55440d5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c35950bfa9abaaf16548a287a8d5d782a361414f
+refs/heads/master: 464fb419e17083a18b636c9f4714fc49ef6857d2
diff --git a/trunk/drivers/xen/blkback/blkback.c b/trunk/drivers/xen/blkback/blkback.c
index eda50646775d..d32198d1be04 100644
--- a/trunk/drivers/xen/blkback/blkback.c
+++ b/trunk/drivers/xen/blkback/blkback.c
@@ -637,18 +637,23 @@ static int __init blkif_init(void)
 
 	blkbk->pending_reqs          = kmalloc(sizeof(blkbk->pending_reqs[0]) *
 					blkif_reqs, GFP_KERNEL);
-	blkbk->pending_grant_handles = kmalloc(sizeof(blkbk->pending_grant_handles[0]) *
-					mmap_pages, GFP_KERNEL);
-	blkbk->pending_pages         = alloc_empty_pages_and_pagevec(mmap_pages);
+	blkbk->pending_grant_handles = vzalloc(sizeof(blkbk->pending_grant_handles[0]) *
+					mmap_pages);
+	blkbk->pending_pages         = vzalloc(sizeof(blkbk->pending_pages[0]) * mmap_pages);
 
 	if (!blkbk->pending_reqs || !blkbk->pending_grant_handles || !blkbk->pending_pages) {
 		rc = -ENOMEM;
 		goto out_of_memory;
 	}
 
-	for (i = 0; i < mmap_pages; i++)
+	for (i = 0; i < mmap_pages; i++) {
 		blkbk->pending_grant_handles[i] = BLKBACK_INVALID_HANDLE;
-
+		blkbk->pending_pages[i] = alloc_page(GFP_KERNEL | __GFP_HIGHMEM);
+		if (blkbk->pending_pages[i] == NULL) {
+			rc = -ENOMEM;
+			goto out_of_memory;
+		}
+	}
 	rc = blkif_interface_init();
 	if (rc)
 		goto failed_init;
@@ -672,8 +677,12 @@ static int __init blkif_init(void)
 	printk(KERN_ERR "%s: out of memory\n", __func__);
  failed_init:
 	kfree(blkbk->pending_reqs);
-	kfree(blkbk->pending_grant_handles);
-	free_empty_pages_and_pagevec(blkbk->pending_pages, mmap_pages);
+	vfree(blkbk->pending_grant_handles);
+	for (i = 0; i < mmap_pages; i++) {
+		if (blkbk->pending_pages[i])
+			__free_page(blkbk->pending_pages[i]);
+	}
+	vfree(blkbk->pending_pages);
 	vfree(blkbk);
 	blkbk = NULL;
 	return rc;