From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 27 May 2010 20:30:48 +0000 (-0700)
Subject: Merge commit 'refs/top-bases/feature-branch' into feature-branch
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~51^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0820238425ad98ab43d5e24676301ce55e790bc;p=zfs

Merge commit 'refs/top-bases/feature-branch' into feature-branch

Conflicts:
	cmd/ztest/ztest.c
	lib/libzpool/include/sys/zfs_context.h
	lib/libzpool/kernel.c
	lib/libzpool/taskq.c
---

a0820238425ad98ab43d5e24676301ce55e790bc
diff --cc cmd/ztest/ztest.c
index b2d3ea742,e933c8d69..16fc58e7e
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@@ -2562,9 -2555,9 +2560,9 @@@ ztest_dmu_write_parallel(ztest_args_t *
  	int bs = ZTEST_DIROBJ_BLOCKSIZE;
  	int do_free = 0;
  	uint64_t off, txg, txg_how;
- 	kmutex_t *lp;
+ 	mutex_t *lp;
  	char osname[MAXNAMELEN];
 -	char iobuf[SPA_MAXBLOCKSIZE];
 +	char *iobuf;
  	blkptr_t blk = { 0 };
  	uint64_t blkoff;
  	zbookmark_t zb;
diff --cc lib/libzpool/include/sys/zfs_context.h
index 522d860ab,230c233a2..327f81785
--- a/lib/libzpool/include/sys/zfs_context.h
+++ b/lib/libzpool/include/sys/zfs_context.h
@@@ -351,9 -330,8 +330,8 @@@ extern taskq_t	*taskq_create(const cha
  extern taskqid_t taskq_dispatch(taskq_t *, task_func_t, void *, uint_t);
  extern void	taskq_destroy(taskq_t *);
  extern void	taskq_wait(taskq_t *);
 -extern int	taskq_member(taskq_t *, void *);
 +extern int	taskq_member(taskq_t *, kthread_t *);
  extern void	system_taskq_init(void);
- extern void	system_taskq_fini(void);
  
  #define	XVA_MAPSIZE	3
  #define	XVA_MAGIC	0x78766174