Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

OpenZFS 9192 - explicitly pass good_writes to vdev_uberblock/label_sync 

Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Richard Lowe <richlowe@richlowe.net>
Ported-by: Giuseppe Di Natale <dinatale2@llnl.gov>

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.

OpenZFS-issue: https://www.illumos.org/issues/9192
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/3f4c0b602d
Closes #7446
This commit is contained in:
Matthew Ahrens 2016-12-16 10:31:01 -08:00 committed by Brian Behlendorf
parent d830d4795a
commit 7f96cc23ac
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
module/zfs/vdev_label.c
View File

@ -1280,10 +1280,13 @@ vdev_uberblock_sync_done(zio_t *zio)
* Write the uberblock to all labels of all leaves of the specified vdev. * Write the uberblock to all labels of all leaves of the specified vdev.
*/ */
static void 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 (int c = 0; c < vd->vdev_children; c++) for (uint64_t c = 0; c < vd->vdev_children; c++) {
vdev_uberblock_sync(zio, ub, vd->vdev_child[c], flags); vdev_uberblock_sync(zio, good_writes,
ub, vd->vdev_child[c], flags);
}
if (!vd->vdev_ops->vdev_op_leaf) if (!vd->vdev_ops->vdev_op_leaf)
return; return;
@ -1309,7 +1312,7 @@ vdev_uberblock_sync(zio_t *zio, uberblock_t *ub, vdev_t *vd, int flags)
for (int l = 0; l < VDEV_LABELS; l++) for (int l = 0; l < VDEV_LABELS; l++)
vdev_label_write(zio, vd, l, ub_abd, vdev_label_write(zio, vd, l, ub_abd,
VDEV_UBERBLOCK_OFFSET(vd, n), VDEV_UBERBLOCK_SIZE(vd), 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); flags | ZIO_FLAG_DONT_PROPAGATE);
abd_free(ub_abd); abd_free(ub_abd);
@ -1323,10 +1326,10 @@ vdev_uberblock_sync_list(vdev_t **svd, int svdcount, uberblock_t *ub, int flags)
zio_t *zio; zio_t *zio;
uint64_t good_writes = 0; 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++) 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); (void) zio_wait(zio);
@ -1387,7 +1390,8 @@ vdev_label_sync_ignore_done(zio_t *zio)
* Write all even or odd labels to all leaves of the specified vdev. * Write all even or odd labels to all leaves of the specified vdev.
*/ */
static void 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; nvlist_t *label;
vdev_phys_t *vp; vdev_phys_t *vp;
@ -1395,8 +1399,10 @@ vdev_label_sync(zio_t *zio, vdev_t *vd, int l, uint64_t txg, int flags)
char *buf; char *buf;
size_t buflen; size_t buflen;
for (int c = 0; c < vd->vdev_children; c++) for (int c = 0; c < vd->vdev_children; c++) {
vdev_label_sync(zio, vd->vdev_child[c], l, txg, flags); vdev_label_sync(zio, good_writes,
vd->vdev_child[c], l, txg, flags);
}
if (!vd->vdev_ops->vdev_op_leaf) if (!vd->vdev_ops->vdev_op_leaf)
return; return;
@ -1421,7 +1427,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, vdev_label_write(zio, vd, l, vp_abd,
offsetof(vdev_label_t, vl_vdev_phys), offsetof(vdev_label_t, vl_vdev_phys),
sizeof (vdev_phys_t), sizeof (vdev_phys_t),
vdev_label_sync_done, zio->io_private, vdev_label_sync_done, good_writes,
flags | ZIO_FLAG_DONT_PROPAGATE); flags | ZIO_FLAG_DONT_PROPAGATE);
} }
} }
@ -1453,7 +1459,7 @@ vdev_label_sync_list(spa_t *spa, int l, uint64_t txg, int flags)
(vd->vdev_islog || vd->vdev_aux != NULL) ? (vd->vdev_islog || vd->vdev_aux != NULL) ?
vdev_label_sync_ignore_done : vdev_label_sync_top_done, vdev_label_sync_ignore_done : vdev_label_sync_top_done,
good_writes, flags); good_writes, flags);
vdev_label_sync(vio, vd, l, txg, flags); vdev_label_sync(vio, good_writes, vd, l, txg, flags);
zio_nowait(vio); zio_nowait(vio);
} }