system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 12:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverting r354594

Browse source 
In our case the structure is more complex and simple static initializer
will upset compiler diagnostics - using memset is still better than building
more complext initializer.
This commit is contained in:
Toomas Soome 2019-11-12 10:02:39 +00:00
parent 7483fbadf4
commit c082b391b0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=354635
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
stand/libsa/zfs/zfsimpl.c
View file

@ -1697,7 +1697,7 @@ vdev_uberblock_load(vdev_t *vd, uberblock_t *ub)
static int
vdev_probe(vdev_phys_read_t *_read, void *read_priv, spa_t **spap)
{
vdev_t vtmp = { 0 };
vdev_t vtmp;
spa_t *spa;
vdev_t *vdev, *top_vdev, *pool_vdev;
unsigned char *nvlist;
@ -1713,6 +1713,7 @@ vdev_probe(vdev_phys_read_t *_read, void *read_priv, spa_t **spap)
* Load the vdev label and figure out which
* uberblock is most current.
*/
memset(&vtmp, 0, sizeof(vtmp));
vtmp.v_phys_read = _read;
vtmp.v_read_priv = read_priv;
vtmp.v_psize = P2ALIGN(ldi_get_size(read_priv),