From 7439b5690ca54fde7f93d4c73cf0217d3163fafb Mon Sep 17 00:00:00 2001
From: "Yan, Zheng" <zheng.z.yan@intel.com>
Date: Wed, 6 Jun 2012 09:15:33 -0500
Subject: [PATCH] --- yaml --- r: 312095 b: refs/heads/master c:
 236df3755d944c33120d77e84b5ff6f3917eb307 h: refs/heads/master i:   312093:
 31f9ee210dc87e6af111c517651bc32c1768d786   312091:
 51cc60278a5725e40dfc9885fdbbafa307f713cf   312087:
 dc0c8cb6f98253ae4362d6731ad99c89b4b602c1   312079:
 262a6a01c62ffd48930e2c0de0a00eee9c7916dd   312063:
 3a21233878b83d5ece892ad002ecd7753d18c3d8 v: v3

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

diff --git a/[refs] b/[refs]
index c5c15ddac2cf..d047a1cad2b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bdca4e0768d3e0f4efa43d9a2cc8210aeb91ab9
+refs/heads/master: 236df3755d944c33120d77e84b5ff6f3917eb307
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index 65665c9c42c6..8b9c1734d807 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -499,7 +499,7 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
 			 / sizeof (*ondisk))
 		return -EINVAL;
 	header->snapc = kmalloc(sizeof(struct ceph_snap_context) +
-				snap_count * sizeof (*ondisk),
+				snap_count * sizeof(u64),
 				gfp_flags);
 	if (!header->snapc)
 		return -ENOMEM;