diff options
| author | fbynite <[email protected]> | 2021-02-20 19:19:20 -0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-02-20 20:19:20 -0800 |
| commit | 11f2e9a491baa2ae3fc00f6b8b892fa91a852ca1 (patch) | |
| tree | 948b0833d73cac362d03fcbefbddc28883d6b703 /module | |
| parent | 7e56b05058c8d2af2b5bc8b0b1475d9fdd6cd7dc (diff) | |
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 <[email protected]>
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 <[email protected]>
Signed-off-by: Rob Wing <[email protected]>
Closes #11623
Diffstat (limited to 'module')
| -rw-r--r-- | module/zfs/vdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c index 64016311b..ad4f3efb8 100644 --- a/module/zfs/vdev.c +++ b/module/zfs/vdev.c @@ -2527,7 +2527,7 @@ vdev_hold(vdev_t *vd) for (int c = 0; c < vd->vdev_children; 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); } @@ -2538,7 +2538,7 @@ vdev_rele(vdev_t *vd) for (int c = 0; c < vd->vdev_children; 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); } |