upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add ZIO_TYPE_FREE support for indirect vdevs.

Browse source 
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
Reviewed by:	allanjude, sef
Approved by:	re (kib)
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D17523
This commit is contained in:
Alexander Motin 2018-10-12 15:14:22 +00:00
parent e4a41be544
commit 770ce5c3bf
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect.c
View file

@ -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,