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;