diff --git a/module/zfs/zfs_log.c b/module/zfs/zfs_log.c
index 0f330ec933aa..6d2e41ad9362 100644
--- a/module/zfs/zfs_log.c
+++ b/module/zfs/zfs_log.c
@@ -126,9 +126,11 @@ zfs_log_xvattr(lr_attr_t *lrattr, xvattr_t *xvap)
 
 	/* Now pack the attributes up in a single uint64_t */
 	attrs = (uint64_t *)bitmap;
+	*attrs = 0;
 	crtime = attrs + 1;
+	bzero(crtime, 2 * sizeof (uint64_t));
 	scanstamp = (caddr_t)(crtime + 2);
-	*attrs = 0;
+	bzero(scanstamp, AV_SCANSTAMP_SZ);
 	if (XVA_ISSET_REQ(xvap, XAT_READONLY))
 		*attrs |= (xoap->xoa_readonly == 0) ? 0 :
 		    XAT0_READONLY;