From abd45f007ad4905adfaea0a1ab15653796cbd27b Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Wed, 16 Oct 2019 05:47:30 +0000 Subject: [PATCH 1/2] 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 --- uts/common/fs/zfs/vdev_disk.c | 5 +++-- uts/common/fs/zfs/vdev_file.c | 5 +++-- 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); From 37c5efc4ded8475e978e83aa31524dac678da688 Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Wed, 16 Oct 2019 06:02:07 +0000 Subject: [PATCH 2/2] 10067 Miscellaneous man page typos illumos/illumos-gate@e61d7e85ebb4a7361eeb10639b742a92e0bf5e55 https://github.com/illumos/illumos-gate/commit/e61d7e85ebb4a7361eeb10639b742a92e0bf5e55 https://www.illumos.org/issues/10067 fileystem - man1m/zfs.1m man1m/boot.1m Author: Peter Tribble --- man/man1m/zfs.1m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/man1m/zfs.1m b/man/man1m/zfs.1m index d27a3ee49f49..cb92a9ec6ad8 100644 --- a/man/man1m/zfs.1m +++ b/man/man1m/zfs.1m @@ -2447,7 +2447,7 @@ option was not specified. .Cm remap .Ar filesystem Ns | Ns Ar volume .Xc -Remap the indirect blocks in the given fileystem or volume so that they no +Remap the indirect blocks in the given filesystem or volume so that they no longer reference blocks on previously removed vdevs and we can eventually shrink the size of the indirect mapping objects for the previously removed vdevs. Note that remapping all blocks might not be possible and that