---

yaml --- r: 312095 b: refs/heads/master c: 236df37 h: refs/heads/master i: 312093: 31f9ee2 312091: 51cc602 312087: dc0c8cb 312079: 262a6a0 312063: 3a21233 v: v3
git-mirror · Jul 18, 2012 · 7439b56 · 7439b56
1 parent b567b98
commit 7439b56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;