From 62b672ca128cd79153f44ea2115a87690b56a16b Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Mon, 6 May 2013 09:51:29 -0500
Subject: [PATCH] --- yaml --- r: 375593 b: refs/heads/master c:
 46578dcdca951f3da70d3a5a9b5166b2a492a182 h: refs/heads/master i:   375591:
 013e47652c10e13acdb91e2039808a74a26f8159 v: v3

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

diff --git a/[refs] b/[refs]
index 19ab3563c40a..78653e47237e 100644
--- 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
index a05b6e5dc362..b0fbc38cc6f0 100644
--- 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;