From 0e95605c7e9f3214e0e60351a33a401b87164694 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: 320262 b: refs/heads/master c:
 f9f9a1904467816452fc70740165030e84c2c659 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ae489c3f6e38..312518483336 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5988c490ef66cb04ea2f610681949b25c773b3c
+refs/heads/master: f9f9a1904467816452fc70740165030e84c2c659
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;