diff options
| author | pjd <pjd@FreeBSD.org> | 2010-05-16 19:44:08 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2010-05-16 19:44:08 +0000 |
| commit | 15e5afeb5bf05cd26d10c5fde972e85a1c99fda3 (patch) | |
| tree | d7a623a0bd1ac90e9934593c6731c08e09b116aa | |
| parent | 8ea4ab29a0e5c107b9aa81880eb890891c9eddcc (diff) | |
| download | FreeBSD-src-15e5afeb5bf05cd26d10c5fde972e85a1c99fda3.zip FreeBSD-src-15e5afeb5bf05cd26d10c5fde972e85a1c99fda3.tar.gz | |
Fix userland build by making io_task available only for the kernel and by
providing taskq_dispatch_safe() macro.
MFC after: 1 week
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h | 3 | ||||
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h index ee202c8..6623be3 100644 --- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h +++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h @@ -343,6 +343,9 @@ extern void taskq_wait(taskq_t *); extern int taskq_member(taskq_t *, void *); extern void system_taskq_init(void); +#define taskq_dispatch_safe(tq, func, arg, task) \ + taskq_dispatch((tq), (func), (arg), TQ_SLEEP) + #define XVA_MAPSIZE 3 #define XVA_MAGIC 0x78766174 diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h index f61ca89..8c8efcd 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h @@ -317,8 +317,10 @@ struct zio { /* FMA state */ uint64_t io_ena; +#ifdef _KERNEL /* FreeBSD only. */ struct ostask io_task; +#endif }; extern zio_t *zio_null(zio_t *pio, spa_t *spa, |
