提交 46578dcd 编写于 作者: A Alex Elder

rbd: zero format 1 header structure earlier

The passed-in header structure is zeroed in rbd_header_from_disk().
Instead, have the caller do it.  Note that there are two callers,
rbd_dev_v1_refresh() and rbd_dev_v1_probe().  The latter already has
a zeroed header structure so zeroing it isn't necessary there.
Signed-off-by: NAlex Elder <elder@inktank.com>
Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
上级 f35a4dee
...@@ -738,8 +738,6 @@ static int rbd_header_from_disk(struct rbd_image_header *header, ...@@ -738,8 +738,6 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
size_t size; size_t size;
u32 i; u32 i;
memset(header, 0, sizeof (*header));
snap_count = le32_to_cpu(ondisk->snap_count); snap_count = le32_to_cpu(ondisk->snap_count);
len = strnlen(ondisk->object_prefix, sizeof (ondisk->object_prefix)); len = strnlen(ondisk->object_prefix, sizeof (ondisk->object_prefix));
...@@ -3103,6 +3101,7 @@ static int rbd_dev_v1_refresh(struct rbd_device *rbd_dev) ...@@ -3103,6 +3101,7 @@ static int rbd_dev_v1_refresh(struct rbd_device *rbd_dev)
int ret; int ret;
struct rbd_image_header h; struct rbd_image_header h;
memset(&h, 0, sizeof (h));
ret = rbd_read_header(rbd_dev, &h); ret = rbd_read_header(rbd_dev, &h);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册