[src/netbsd-9]: src/external/cddl/osnet/dist/uts/common/fs/zfs Pull up follow...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/75fe3dfbeebe
branches:  netbsd-9
changeset: 946514:75fe3dfbeebe
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Nov 29 11:39:45 2020 +0000

description:
Pull up following revision(s) (requested by yhardy in ticket #1138):

        external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c: revision 1.19

Use vn_close to release the vnodes in the error handling blocks, since
the vnodes were opened for writing. Fix proposed on tech-kern
and improved by hannken@.

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c |  8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diffs (27 lines):

diff -r 5b5d773b5a35 -r 75fe3dfbeebe external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c    Sun Nov 29 11:36:46 2020 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c    Sun Nov 29 11:39:45 2020 +0000
@@ -215,7 +215,11 @@
                return (SET_ERROR(error));
        }
        if (vp->v_type != VBLK) {
+#ifdef __NetBSD__
+               vn_close(vp, FREAD|FWRITE, kcred);
+#else
                vrele(vp);
+#endif
                vd->vdev_stat.vs_aux = VDEV_AUX_OPEN_FAILED;
                return (SET_ERROR(EINVAL));
        }
@@ -247,7 +251,11 @@
        error = workqueue_create(&dvd->vd_wq, "vdevsync",
            vdev_disk_flush, dvd, PRI_NONE, IPL_NONE, WQ_MPSAFE);
        if (error != 0) {
+#ifdef __NetBSD__
+               vn_close(vp, FREAD|FWRITE, kcred);
+#else
                vrele(vp);
+#endif
                return (SET_ERROR(error));
        }