leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rbd: zero format 1 header structure earlier

Browse Source 
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: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2013-05-06 09:51:29 -05:00
parent f35a4dee14
commit 46578dcdca
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/block/rbd.c
View File

@ -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)
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;