svn commit: r353605 - vendor-sys/illumos/dist/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Wed Oct 16 05:47:30 2019
New Revision: 353605
URL: https://svnweb.freebsd.org/changeset/base/353605

Log:
  10154 zfs: cast between incompatible function types
  
  illumos/illumos-gate at c62757b2b8b6c26589d7704d0ff20beb107fcd9a
  https://github.com/illumos/illumos-gate/commit/c62757b2b8b6c26589d7704d0ff20beb107fcd9a
  
  https://www.illumos.org/issues/10154
  
  Author: Toomas Soome <tsoome at me.com>

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_disk.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_file.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_disk.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_disk.c	Wed Oct 16 03:03:59 2019	(r353604)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_disk.c	Wed Oct 16 05:47:30 2019	(r353605)
@@ -700,7 +700,7 @@ vdev_disk_ldi_physio(ldi_handle_t vd_lh, caddr_t data,
 	return (error);
 }
 
-static void
+static int
 vdev_disk_io_intr(buf_t *bp)
 {
 	vdev_buf_t *vb = (vdev_buf_t *)bp;
@@ -725,6 +725,7 @@ vdev_disk_io_intr(buf_t *bp)
 	kmem_free(vb, sizeof (vdev_buf_t));
 
 	zio_delay_interrupt(zio);
+	return (0);
 }
 
 static void
@@ -844,7 +845,7 @@ vdev_disk_io_start(zio_t *zio)
 
 	bp->b_lblkno = lbtodb(zio->io_offset);
 	bp->b_bufsize = zio->io_size;
-	bp->b_iodone = (int (*)())vdev_disk_io_intr;
+	bp->b_iodone = vdev_disk_io_intr;
 
 	/* ldi_strategy() will return non-zero only on programming errors */
 	VERIFY(ldi_strategy(dvd->vd_lh, bp) == 0);

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_file.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_file.c	Wed Oct 16 03:03:59 2019	(r353604)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_file.c	Wed Oct 16 05:47:30 2019	(r353605)
@@ -148,7 +148,7 @@ vdev_file_close(vdev_t *vd)
  * interrupt taskqs. For consistency, the code structure mimics disk vdev
  * types.
  */
-static void
+static int
 vdev_file_io_intr(buf_t *bp)
 {
 	vdev_buf_t *vb = (vdev_buf_t *)bp;
@@ -166,6 +166,7 @@ vdev_file_io_intr(buf_t *bp)
 
 	kmem_free(vb, sizeof (vdev_buf_t));
 	zio_delay_interrupt(zio);
+	return (0);
 }
 
 static void
@@ -241,7 +242,7 @@ vdev_file_io_start(zio_t *zio)
 	bp->b_lblkno = lbtodb(zio->io_offset);
 	bp->b_bufsize = zio->io_size;
 	bp->b_private = vf->vf_vnode;
-	bp->b_iodone = (int (*)())vdev_file_io_intr;
+	bp->b_iodone = vdev_file_io_intr;
 
 	VERIFY3U(taskq_dispatch(system_taskq, vdev_file_io_strategy, bp,
 	    TQ_SLEEP), !=, 0);