Merge tag 'spl-0.7.0' into test

SPL Version 0.7.0

diff --cc include/sys/user.h
index ebbe8f68eb834fda2814a8835fd4393cf4070a59,2b25dd33c01aa5bef72749be108a0225bd8061e1..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/include/sys/user.h
--- 2/include/sys/user.h
+++ /dev/null
@@@ -1,42 -1,42 +1,0 @@@
--/*****************************************************************************\
-- *  Copyright (C) 2015 Cluster Inc.
-- *  Produced at ClusterHQ Inc (cf, DISCLAIMER).
-- *  Written by Richard Yao <richard.yao@clusterhq.com>.
-- *
-- *  This file is part of the SPL, Solaris Porting Layer.
-- *  For details, see <http://zfsonlinux.org/>.
-- *
-- *  The SPL is free software; you can redistribute it and/or modify it
-- *  under the terms of the GNU General Public License as published by the
-- *  Free Software Foundation; either version 2 of the License, or (at your
-- *  option) any later version.
-- *
-- *  The SPL is distributed in the hope that it will be useful, but WITHOUT
-- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-- *  for more details.
-- *
-- *  You should have received a copy of the GNU General Public License along
-- *  with the SPL.  If not, see <http://www.gnu.org/licenses/>.
--\*****************************************************************************/
--
--#ifndef _SPL_USER_H
--#define _SPL_USER_H
--
--/*
-- * We have uf_info_t for areleasef(). We implement areleasef() using a global
-- * linked list of all open file descriptors with the task structs referenced,
-- * so accessing the correct descriptor from areleasef() only requires knowing
-- * about the Linux task_struct. Since this is internal to our compatibility
-- * layer, we make it an opaque type.
-- *
-  * XXX: If the descriptor changes under us, we would get an incorrect
-  * reference.
 - * XXX: If the descriptor changes under us and we do not do a getf() between
 - * the change and using it, we would get an incorrect reference.
-- */
--
--struct uf_info;
--typedef struct uf_info uf_info_t;
--
--#define P_FINFO(x) ((uf_info_t *)x)
--
--#endif /* SPL_USER_H */

diff --cc module/spl/spl-taskq.c
index 017b410ac03a6384a7a004b432aef3ff20bc6609,83f483ea9762c78fd626a4309b65cad4f098e1bc..6928a775491abdd6ddf9932ba3d009f2ea8739f1
--- 1/module/spl/spl-taskq.c
--- 2/module/spl/spl-taskq.c
+++ b/module/spl/spl-taskq.c
@@@ -49,11 -50,19 +50,23 @@@ MODULE_PARM_DESC(spl_taskq_thread_seque
  /* Global system-wide dynamic task queue available for all consumers */
  taskq_t *system_taskq;
  EXPORT_SYMBOL(system_taskq);
+ /* Global dynamic task queue for long delay */
+ taskq_t *system_delay_taskq;
+ EXPORT_SYMBOL(system_delay_taskq);
+ 
+ /* Private dedicated taskq for creating new taskq threads on demand. */
+ static taskq_t *dynamic_taskq;
+ static taskq_thread_t *taskq_thread_create(taskq_t *);
+ 
+ /* List of all taskqs */
+ LIST_HEAD(tq_list);
+ DECLARE_RWSEM(tq_list_sem);
+ static uint_t taskq_tsd;
  
 +/* Private dedicated taskq for creating new taskq threads on demand. */
 +static taskq_t *dynamic_taskq;
 +static taskq_thread_t *taskq_thread_create(taskq_t *);
 +
  static int
  task_km_flags(uint_t flags)
  {