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

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

c17d3e05eb23d597581b3ce46aa9d145857dedf6
diff --cc cmd/ztest/ztest.c
index 3fff7f416,16fc58e7e..4f8ca0d6b
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@@ -2575,10 -2560,10 +2573,10 @@@ 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;
 -	blkptr_t blk = { 0 };
 +	blkptr_t blk;
  	uint64_t blkoff;
  	zbookmark_t zb;
  	dmu_tx_t *tx = dmu_tx_create(os);
diff --cc lib/libzpool/kernel.c
index 21e039365,89108fe5b..7f6c37da0
--- a/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@@ -35,8 -34,8 +34,7 @@@
  #include <sys/stat.h>
  #include <sys/processor.h>
  #include <sys/zfs_context.h>
 -#include <sys/zmod.h>
  #include <sys/utsname.h>
- #include <sys/time.h>
  #include <sys/systeminfo.h>
  
  /*