diff --git a/lib/libspl/include/umem.h b/lib/libspl/include/umem.h index 3e19aff9ec..0ed55ae5af 100644 --- a/lib/libspl/include/umem.h +++ b/lib/libspl/include/umem.h @@ -42,9 +42,22 @@ extern "C" { #endif +typedef void vmem_t; + +/* + * Flags for umem_alloc/umem_free + */ #define UMEM_DEFAULT 0x0000 /* normal -- may fail */ #define UMEM_NOFAIL 0x0100 /* Never fails */ +/* + * Flags for umem_cache_create() + */ +#define UMC_NOTOUCH 0x00010000 +#define UMC_NODEBUG 0x00020000 +#define UMC_NOMAGAZINE 0x00040000 +#define UMC_NOHASH 0x00080000 + #define UMEM_CACHE_NAMELEN 31 typedef int umem_nofail_callback_t(void); diff --git a/module/zfs/zio.c b/module/zfs/zio.c index 54d7637adf..792d7a6464 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -911,8 +911,9 @@ zio_taskq_member(zio_t *zio, enum zio_taskq_type q) { kthread_t *executor = zio->io_executor; spa_t *spa = zio->io_spa; + zio_type_t t; - for (zio_type_t t = 0; t < ZIO_TYPES; t++) + for (t = 0; t < ZIO_TYPES; t++) if (taskq_member(spa->spa_zio_taskq[t][q], executor)) return (B_TRUE);