vdev_ops: don't try to call vdev_op_hold or vdev_op_rele when NULL
This prevents a panic after a SLOG add/removal on the root pool followed by a zpool scrub. When a SLOG is removed, a hole takes its place - the vdev_ops for a hole is vdev_hole_ops, which defines the handler functions of vdev_op_hold and vdev_op_rele as NULL. This bug has been reported in illumos and FreeBSD, a different trigger in the FreeBSD report though. Credit for this patch goes to Patrick Mooney <pmooney@pfmooney.com> Obtained from: illumos-gate commit: c65bd18728f34725 External-issue: https://www.illumos.org/issues/12981 External-issue: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252396 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Rob Wing <rob.fx907@gmail.com> Closes #11623
This commit is contained in:
parent
7e56b05058
commit
11f2e9a491
@ -2527,7 +2527,7 @@ vdev_hold(vdev_t *vd)
|
|||||||
for (int c = 0; c < vd->vdev_children; c++)
|
for (int c = 0; c < vd->vdev_children; c++)
|
||||||
vdev_hold(vd->vdev_child[c]);
|
vdev_hold(vd->vdev_child[c]);
|
||||||
|
|
||||||
if (vd->vdev_ops->vdev_op_leaf)
|
if (vd->vdev_ops->vdev_op_leaf && vd->vdev_ops->vdev_op_hold != NULL)
|
||||||
vd->vdev_ops->vdev_op_hold(vd);
|
vd->vdev_ops->vdev_op_hold(vd);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2538,7 +2538,7 @@ vdev_rele(vdev_t *vd)
|
|||||||
for (int c = 0; c < vd->vdev_children; c++)
|
for (int c = 0; c < vd->vdev_children; c++)
|
||||||
vdev_rele(vd->vdev_child[c]);
|
vdev_rele(vd->vdev_child[c]);
|
||||||
|
|
||||||
if (vd->vdev_ops->vdev_op_leaf)
|
if (vd->vdev_ops->vdev_op_leaf && vd->vdev_ops->vdev_op_rele != NULL)
|
||||||
vd->vdev_ops->vdev_op_rele(vd);
|
vd->vdev_ops->vdev_op_rele(vd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user