---

yaml --- r: 375593 b: refs/heads/master c: 46578dc h: refs/heads/master i: 375591: 013e476 v: v3
git-mirror · May 8, 2013 · 62b672c · 62b672c
1 parent 913abf0
commit 62b672c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f35a4dee14c31dc00807f3bcd59cc7a6959f63d7
+refs/heads/master: 46578dcdca951f3da70d3a5a9b5166b2a492a182
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
@@ -738,8 +738,6 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
 	size_t size;
 	u32 i;
 
-	memset(header, 0, sizeof (*header));
-
 	snap_count = le32_to_cpu(ondisk->snap_count);
 
 	len = strnlen(ondisk->object_prefix, sizeof (ondisk->object_prefix));
@@ -3103,6 +3101,7 @@ static int rbd_dev_v1_refresh(struct rbd_device *rbd_dev)
 	int ret;
 	struct rbd_image_header h;
 
+	memset(&h, 0, sizeof (h));
 	ret = rbd_read_header(rbd_dev, &h);
 	if (ret < 0)
 		return ret;