git: ee0b7e05e72c - releng/13.0 - zfs: fix panic if scrubbing after removing a slog device

[Martin Matuska]

The branch releng/13.0 has been updated by mm:

URL: https://cgit.FreeBSD.org/src/commit/?id=ee0b7e05e72c8820441faff29a9df99b47aed6a0

commit ee0b7e05e72c8820441faff29a9df99b47aed6a0
Author:     Martin Matuska <mm at FreeBSD.org>
AuthorDate: 2021-02-22 17:05:07 +0000
Commit:     Martin Matuska <mm at FreeBSD.org>
CommitDate: 2021-02-25 16:19:49 +0000

    zfs: fix panic if scrubbing after removing a slog device
    
    From openzfs-master 11f2e9a4 commit message:
      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.
    
    Patch Author: Patrick Mooney <pmooney at pfmooney.com>
    
    Obtained from:  openzfs/zfs at 11f2e9a491baa2ae3fc00f6b8b892fa91a852ca1
    PR:             252396
    Approved by:    re (gjb)
    
    (cherry picked from commit 64649f0285424435634c2dfd39f49536fc2b50dd)
---
 sys/contrib/openzfs/module/zfs/vdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/contrib/openzfs/module/zfs/vdev.c b/sys/contrib/openzfs/module/zfs/vdev.c
index 7ffe924212da..5b83f8c22fed 100644
--- a/sys/contrib/openzfs/module/zfs/vdev.c
+++ b/sys/contrib/openzfs/module/zfs/vdev.c
@@ -2393,7 +2393,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);
 }
 
@@ -2404,7 +2404,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);
 }