d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

10154 zfs: cast between incompatible function types

Browse Source 
illumos/illumos-gate@c62757b2b8
c62757b2b8

https://www.illumos.org/issues/10154

Author: Toomas Soome <tsoome@me.com>
This commit is contained in:
Andriy Gapon 2019-10-16 05:47:30 +00:00
parent 1dd2b15521
commit abd45f007a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
uts/common/fs/zfs/vdev_disk.c
View File

@ -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);

5
uts/common/fs/zfs/vdev_file.c
View File

@ -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);