Module Name: src
Committed By: martin
Date: Sun Nov 29 11:39:45 UTC 2020
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]: vdev_disk.c
Log Message:
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@.
To generate a diff of this commit:
cvs rdiff -u -r1.11.2.5 -r1.11.2.6 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.11.2.5 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.11.2.6
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.11.2.5 Tue Jun 30 17:55:35 2020
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c Sun Nov 29 11:39:45 2020
@@ -215,7 +215,11 @@ vdev_disk_open(vdev_t *vd, uint64_t *psi
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 @@ vdev_disk_open(vdev_t *vd, uint64_t *psi
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));
}
