From a876892309be58b386aadafd2bb20c2b48c14f97 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 21 May 2010 10:40:09 -0700
Subject: [PATCH] Revert user space changes from linux-kernel-module topic
 branch.

These changes do not belong on linux-kernel-module since they
are tweaks to user space utilities.  I'm reverting them from
this topic branch and will be moving them to a new topic branch
which can be used for just this sort of thing.
---
 cmd/zdb/zdb.c                | 2 +-
 lib/libzfs/libzfs_sendrecv.c | 1 -
 lib/libzfs/libzfs_util.c     | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
index 2cab6da0f3..ce84349586 100644
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@ -2395,7 +2395,7 @@ main(int argc, char **argv)
 
 	kernel_init(FREAD);
 	g_zfs = libzfs_init();
-	VERIFY(g_zfs != NULL);
+	ASSERT(g_zfs != NULL);
 
 	for (c = 0; c < 256; c++) {
 		if (dump_all && c != 'l' && c != 'R')
diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c
index eb799901d6..be5b3949f7 100644
--- a/lib/libzfs/libzfs_sendrecv.c
+++ b/lib/libzfs/libzfs_sendrecv.c
@@ -39,7 +39,6 @@
 #include <sys/mntent.h>
 #include <sys/mnttab.h>
 #include <sys/avl.h>
-#include <sys/debug.h>
 #include <stddef.h>
 
 #include <libzfs.h>
diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
index 899d87e846..8d0c47e301 100644
--- a/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@ -578,8 +578,6 @@ libzfs_init(void)
 	}
 
 	if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) {
-		(void) fprintf(stderr, "Unable to open %s: (%d) %s\n",
-			       ZFS_DEV, errno, strerror(errno));
 		free(hdl);
 		return (NULL);
 	}