Author: mav
Date: Fri Oct 19 04:30:25 2018
New Revision: 339440
URL: https://svnweb.freebsd.org/changeset/base/339440
Log:
MFC r339329: Add ZIO_TYPE_FREE support for indirect vdevs.
Upstream code expects only ZIO_TYPE_READ and some ZIO_TYPE_WRITE
requests to removed (indirect) vdevs, while on FreeBSD there is also
ZIO_TYPE_FREE (TRIM). ZIO_TYPE_FREE requests do not have the data
buffers, so don't need the pointer adjustment.
PR: 228750, 229007
Modified:
stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect.c
Directory Properties:
stable/11/ (props changed)
Modified:
stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect.c
Fri Oct 19 04:28:30 2018 (r339439)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect.c
Fri Oct 19 04:30:25 2018 (r339440)
@@ -1147,6 +1147,9 @@ vdev_indirect_child_io_done(zio_t *zio)
pio->io_error = zio_worst_error(pio->io_error, zio->io_error);
mutex_exit(&pio->io_lock);
+#ifdef __FreeBSD__
+ if (zio->io_abd != NULL)
+#endif
abd_put(zio->io_abd);
}
@@ -1262,8 +1265,12 @@ vdev_indirect_io_start(zio_t *zio)
zio->io_vsd_ops = &vdev_indirect_vsd_ops;
ASSERT(spa_config_held(spa, SCL_ALL, RW_READER) != 0);
+#ifdef __FreeBSD__
+ if (zio->io_type == ZIO_TYPE_WRITE) {
+#else
if (zio->io_type != ZIO_TYPE_READ) {
ASSERT3U(zio->io_type, ==, ZIO_TYPE_WRITE);
+#endif
/*
* Note: this code can handle other kinds of writes,
* but we don't expect them.
@@ -1295,6 +1302,9 @@ vdev_indirect_io_start(zio_t *zio)
ASSERT3P(list_next(&iv->iv_splits, first), ==, NULL);
zio_nowait(zio_vdev_child_io(zio, zio->io_bp,
first->is_vdev, first->is_target_offset,
+#ifdef __FreeBSD__
+ zio->io_abd == NULL ? NULL :
+#endif
abd_get_offset(zio->io_abd, 0),
zio->io_size, zio->io_type, zio->io_priority, 0,
vdev_indirect_child_io_done, zio));
@@ -1321,6 +1331,9 @@ vdev_indirect_io_start(zio_t *zio)
is != NULL; is = list_next(&iv->iv_splits, is)) {
zio_nowait(zio_vdev_child_io(zio, NULL,
is->is_vdev, is->is_target_offset,
+#ifdef __FreeBSD__
+ zio->io_abd == NULL ? NULL :
+#endif
abd_get_offset(zio->io_abd,
is->is_split_offset),
is->is_size, zio->io_type,
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
