From 398bcbe4dfdf9509c159c198d79cd30a43976ad9 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 20 Apr 2012 15:49:44 -0500
Subject: [PATCH] --- yaml --- r: 309447 b: refs/heads/master c:
 f8ad495a8a0277b88c59bf38319e5e944aaf5a4a h: refs/heads/master i:   309445:
 d30ef4dcacf68a51c510b8876430f447d6481d5c   309443:
 883e96f8d6d00d63b5f027d79aa769ee2857878c   309439:
 2acd2f556935ad51460be2651e77e030ed03b1df v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/block/rbd.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7f15d88cb0f4..dc61efe4030d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76aa542fb90e3e91edb1146d10ca7cf2cae8e7e9
+refs/heads/master: f8ad495a8a0277b88c59bf38319e5e944aaf5a4a
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index a67fa63a966b..ca59d4d9471e 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -506,11 +506,11 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
 	header->snap_names_len = le64_to_cpu(ondisk->snap_names_len);
 	if (snap_count) {
 		header->snap_names = kmalloc(header->snap_names_len,
-					     GFP_KERNEL);
+					     gfp_flags);
 		if (!header->snap_names)
 			goto err_snapc;
 		header->snap_sizes = kmalloc(snap_count * sizeof(u64),
-					     GFP_KERNEL);
+					     gfp_flags);
 		if (!header->snap_sizes)
 			goto err_names;
 	} else {