diff --git a/include/sys/taskq.h b/include/sys/taskq.h index 2d7583daf0..fd4af1232e 100644 --- a/include/sys/taskq.h +++ b/include/sys/taskq.h @@ -76,7 +76,7 @@ extern taskq_t *__taskq_create(const char *, int, pri_t, int, int, uint_t); __taskq_create(name, thr, pri, min, max, flags) #define taskq_dispatch(tq, func, priv, flags) \ __taskq_dispatch(tq, func, priv, flags) -#define taskq_destory(tq) destroy_workqueue(tq) +#define taskq_destroy(tq) destroy_workqueue(tq) #define taskq_wait(tq) flush_workqueue(tq) #define taskq_member(tq, kthr) 1 /* XXX -Just be true */ diff --git a/include/sys/vfs.h b/include/sys/vfs.h new file mode 100644 index 0000000000..134f4b6bf4 --- /dev/null +++ b/include/sys/vfs.h @@ -0,0 +1,4 @@ +#ifndef _SPL_ZFS_H +#define _SPL_ZFS_H + +#endif /* SPL_ZFS_H */ diff --git a/modules/splat/splat-taskq.c b/modules/splat/splat-taskq.c index 5abe3a02dc..6effc4cab8 100644 --- a/modules/splat/splat-taskq.c +++ b/modules/splat/splat-taskq.c @@ -62,7 +62,7 @@ splat_taskq_test1(struct file *file, void *arg) splat_vprint(file, SPLAT_TASKQ_TEST1_NAME, "Taskq '%s' function '%s' dispatch failed\n", tq_arg.name, sym2str(splat_taskq_test1_func)); - taskq_destory(tq); + taskq_destroy(tq); return -EINVAL; } @@ -71,7 +71,7 @@ splat_taskq_test1(struct file *file, void *arg) taskq_wait(tq); splat_vprint(file, SPLAT_TASKQ_TEST1_NAME, "Taskq '%s' destroying\n", tq_arg.name); - taskq_destory(tq); + taskq_destroy(tq); return (tq_arg.flag) ? 0 : -EINVAL; } @@ -174,7 +174,7 @@ splat_taskq_test2(struct file *file, void *arg) { splat_vprint(file, SPLAT_TASKQ_TEST2_NAME, "Taskq '%s/%d; destroying\n", tq_args[i].name, tq_args[i].id); - taskq_destory(tq[i]); + taskq_destroy(tq[i]); if (!rc && tq_args[i].flag != ((i * 2) + 1)) { splat_vprint(file, SPLAT_TASKQ_TEST2_NAME,