aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndriy Gapon <avg@FreeBSD.org>2019-10-16 05:47:30 +0000
committerAndriy Gapon <avg@FreeBSD.org>2019-10-16 05:47:30 +0000
commitabd45f007ad4905adfaea0a1ab15653796cbd27b (patch)
tree22478d70ae223ff540cb2ec57b9acadbedd5e6be
parent1dd2b15521ce6fc3a2c3e0e2198fd81404d8c786 (diff)
downloadsrc-abd45f007ad4905adfaea0a1ab15653796cbd27b.tar.gz
src-abd45f007ad4905adfaea0a1ab15653796cbd27b.zip
10154 zfs: cast between incompatible function types
illumos/illumos-gate@c62757b2b8b6c26589d7704d0ff20beb107fcd9a https://github.com/illumos/illumos-gate/commit/c62757b2b8b6c26589d7704d0ff20beb107fcd9a https://www.illumos.org/issues/10154 Author: Toomas Soome <tsoome@me.com>
Notes
Notes: svn path=/vendor-sys/illumos/dist/; revision=353605
-rw-r--r--uts/common/fs/zfs/vdev_disk.c5
-rw-r--r--uts/common/fs/zfs/vdev_file.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/uts/common/fs/zfs/vdev_disk.c b/uts/common/fs/zfs/vdev_disk.c
index c455237e4a6e..2d431373ce1d 100644
--- a/uts/common/fs/zfs/vdev_disk.c
+++ b/uts/common/fs/zfs/vdev_disk.c
@@ -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);
diff --git a/uts/common/fs/zfs/vdev_file.c b/uts/common/fs/zfs/vdev_file.c
index 96534436bbf3..23536ac10513 100644
--- a/uts/common/fs/zfs/vdev_file.c
+++ b/uts/common/fs/zfs/vdev_file.c
@@ -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);