File based pools can BSOD

More care when accessing open file was required. Signed-off-by: Jorgen Lundman <[email protected]>
openzfsonosx · Jan 19, 2025 · 61e1012 · 61e1012
1 parent 7d19d56
commit 61e1012
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/module/os/macos/zfs/vdev_file.c b/module/os/macos/zfs/vdev_file.c
@@ -231,7 +231,6 @@ vdev_file_io_start(zio_t *zio)
 {
 	vdev_t *vd = zio->io_vd;
 	vdev_file_t *vf = vd->vdev_tsd;
-	zfs_file_t *fp = vf->vf_file;
 	int error = 0;
 
 #ifdef CLOSE_ON_UNMOUNT
@@ -272,7 +271,8 @@ vdev_file_io_start(zio_t *zio)
 			 * Issue the flush. If successful, the response will
 			 * be handled in the completion callback, so we're done.
 			 */
-			zio->io_error = zfs_file_fsync(fp, 0);
+			if (vf)
+				zio->io_error = zfs_file_fsync(vf->vf_file, 0);
 		}
 
 		zio->io_error = error;

diff --git a/module/os/macos/zfs/zvolIO.cpp b/module/os/macos/zfs/zvolIO.cpp
@@ -1197,7 +1197,7 @@ zvol_os_is_zvol_impl(const char *path)
 	dprintf("%s: processing '%s'\n", __func__, path);
 
 	/* Validate path */
-	if (path == 0 || strlen(path) <= 1) {
+	if (path == NULL || strlen(path) <= 1) {
 		dprintf("%s no path provided\n", __func__);
 		return (SET_ERROR(ret));
 	}