MFV r336952: 9192 explicitly pass good_writes to vdev_uberblock/label_sync
Currently vdev_label_sync and vdev_uberblock_sync take a zio_t and assume that its io_private is a pointer to the good_writes count. They should instead accept this argument explicitly. illumos/illumos-gate@a3b5583021 Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com> Reviewed by: George Wilson <george.wilson@delphix.com> Approved by: Richard Lowe <richlowe@richlowe.net> Author: Matthew Ahrens <mahrens@delphix.com>
This commit is contained in:
commit
656d46109d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=336954
@ -1175,10 +1175,13 @@ vdev_uberblock_sync_done(zio_t *zio)
|
||||
* Write the uberblock to all labels of all leaves of the specified vdev.
|
||||
*/
|
||||
static void
|
||||
vdev_uberblock_sync(zio_t *zio, uberblock_t *ub, vdev_t *vd, int flags)
|
||||
vdev_uberblock_sync(zio_t *zio, uint64_t *good_writes,
|
||||
uberblock_t *ub, vdev_t *vd, int flags)
|
||||
{
|
||||
for (uint64_t c = 0; c < vd->vdev_children; c++)
|
||||
vdev_uberblock_sync(zio, ub, vd->vdev_child[c], flags);
|
||||
for (uint64_t c = 0; c < vd->vdev_children; c++) {
|
||||
vdev_uberblock_sync(zio, good_writes,
|
||||
ub, vd->vdev_child[c], flags);
|
||||
}
|
||||
|
||||
if (!vd->vdev_ops->vdev_op_leaf)
|
||||
return;
|
||||
@ -1196,7 +1199,7 @@ vdev_uberblock_sync(zio_t *zio, uberblock_t *ub, vdev_t *vd, int flags)
|
||||
for (int l = 0; l < VDEV_LABELS; l++)
|
||||
vdev_label_write(zio, vd, l, ub_abd,
|
||||
VDEV_UBERBLOCK_OFFSET(vd, n), VDEV_UBERBLOCK_SIZE(vd),
|
||||
vdev_uberblock_sync_done, zio->io_private,
|
||||
vdev_uberblock_sync_done, good_writes,
|
||||
flags | ZIO_FLAG_DONT_PROPAGATE);
|
||||
|
||||
abd_free(ub_abd);
|
||||
@ -1210,10 +1213,10 @@ vdev_uberblock_sync_list(vdev_t **svd, int svdcount, uberblock_t *ub, int flags)
|
||||
zio_t *zio;
|
||||
uint64_t good_writes = 0;
|
||||
|
||||
zio = zio_root(spa, NULL, &good_writes, flags);
|
||||
zio = zio_root(spa, NULL, NULL, flags);
|
||||
|
||||
for (int v = 0; v < svdcount; v++)
|
||||
vdev_uberblock_sync(zio, ub, svd[v], flags);
|
||||
vdev_uberblock_sync(zio, &good_writes, ub, svd[v], flags);
|
||||
|
||||
(void) zio_wait(zio);
|
||||
|
||||
@ -1274,7 +1277,8 @@ vdev_label_sync_ignore_done(zio_t *zio)
|
||||
* Write all even or odd labels to all leaves of the specified vdev.
|
||||
*/
|
||||
static void
|
||||
vdev_label_sync(zio_t *zio, vdev_t *vd, int l, uint64_t txg, int flags)
|
||||
vdev_label_sync(zio_t *zio, uint64_t *good_writes,
|
||||
vdev_t *vd, int l, uint64_t txg, int flags)
|
||||
{
|
||||
nvlist_t *label;
|
||||
vdev_phys_t *vp;
|
||||
@ -1282,8 +1286,10 @@ vdev_label_sync(zio_t *zio, vdev_t *vd, int l, uint64_t txg, int flags)
|
||||
char *buf;
|
||||
size_t buflen;
|
||||
|
||||
for (int c = 0; c < vd->vdev_children; c++)
|
||||
vdev_label_sync(zio, vd->vdev_child[c], l, txg, flags);
|
||||
for (int c = 0; c < vd->vdev_children; c++) {
|
||||
vdev_label_sync(zio, good_writes,
|
||||
vd->vdev_child[c], l, txg, flags);
|
||||
}
|
||||
|
||||
if (!vd->vdev_ops->vdev_op_leaf)
|
||||
return;
|
||||
@ -1308,7 +1314,7 @@ vdev_label_sync(zio_t *zio, vdev_t *vd, int l, uint64_t txg, int flags)
|
||||
vdev_label_write(zio, vd, l, vp_abd,
|
||||
offsetof(vdev_label_t, vl_vdev_phys),
|
||||
sizeof (vdev_phys_t),
|
||||
vdev_label_sync_done, zio->io_private,
|
||||
vdev_label_sync_done, good_writes,
|
||||
flags | ZIO_FLAG_DONT_PROPAGATE);
|
||||
}
|
||||
}
|
||||
@ -1340,7 +1346,7 @@ vdev_label_sync_list(spa_t *spa, int l, uint64_t txg, int flags)
|
||||
(vd->vdev_islog || vd->vdev_aux != NULL) ?
|
||||
vdev_label_sync_ignore_done : vdev_label_sync_top_done,
|
||||
good_writes, flags);
|
||||
vdev_label_sync(vio, vd, l, txg, flags);
|
||||
vdev_label_sync(vio, good_writes, vd, l, txg, flags);
|
||||
zio_nowait(vio);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user