Date: Sun, 16 May 2010 19:44:08 +0000 (UTC) From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r208166 - in head: cddl/contrib/opensolaris/lib/libzpool/common/sys sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys Message-ID: <201005161944.o4GJi8bM096961@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pjd Date: Sun May 16 19:44:08 2010 New Revision: 208166 URL: http://svn.freebsd.org/changeset/base/208166 Log: Fix userland build by making io_task available only for the kernel and by providing taskq_dispatch_safe() macro. MFC after: 1 week Modified: head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Modified: head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h ============================================================================== --- head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Sun May 16 19:43:48 2010 (r208165) +++ head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Sun May 16 19:44:08 2010 (r208166) @@ -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 Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Sun May 16 19:43:48 2010 (r208165) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Sun May 16 19:44:08 2010 (r208166) @@ -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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005161944.o4GJi8bM096961>