X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fzinject%2Fzinject.c;h=e76e626fa426d67bf85b9c34a4b1ad58712c2892;hb=149e873ab174ded1f632f2b2eb2267593517c7ca;hp=60c53ceb3fce2d52259185ad7a88ff3f3a5c903a;hpb=572e285762521df27fe5b026f409ba1a21abb7ac;p=zfs.git

diff --git a/cmd/zinject/zinject.c b/cmd/zinject/zinject.c
index 60c53ce..e76e626 100644
--- a/cmd/zinject/zinject.c
+++ b/cmd/zinject/zinject.c
@@ -566,26 +566,13 @@ main(int argc, char **argv)
 	zinject_record_t record = { 0 };
 	char pool[MAXNAMELEN];
 	char dataset[MAXNAMELEN];
-	zfs_handle_t *zhp;
+	zfs_handle_t *zhp = NULL;
 	int nowrites = 0;
 	int dur_txg = 0;
 	int dur_secs = 0;
 	int ret;
 	int flags = 0;
 
-	if ((g_zfs = libzfs_init()) == NULL) {
-		(void) fprintf(stderr, "internal error: failed to "
-		    "initialize ZFS library\n");
-		return (1);
-	}
-
-	libzfs_print_on_error(g_zfs, B_TRUE);
-
-	if ((zfs_fd = open(ZFS_DEV, O_RDWR)) < 0) {
-		(void) fprintf(stderr, "failed to open ZFS device\n");
-		return (1);
-	}
-
 	if (argc == 1) {
 		/*
 		 * No arguments.  Print the available handlers.  If there are no
@@ -765,6 +752,16 @@ main(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
+	if ((g_zfs = libzfs_init()) == NULL)
+		return (1);
+
+	libzfs_print_on_error(g_zfs, B_TRUE);
+
+	if ((zfs_fd = open(ZFS_DEV, O_RDWR)) < 0) {
+		(void) fprintf(stderr, "failed to open ZFS device\n");
+		return (1);
+	}
+
 	if (cancel != NULL) {
 		/*
 		 * '-c' is invalid with any other options.
@@ -954,17 +951,20 @@ main(int argc, char **argv)
 	if (dataset[0] != '\0' && domount) {
 		if ((zhp = zfs_open(g_zfs, dataset, ZFS_TYPE_DATASET)) == NULL)
 			return (1);
-
+#ifdef HAVE_ZPL
 		if (zfs_unmount(zhp, NULL, 0) != 0)
 			return (1);
+#endif /* HAVE_ZPL */
 	}
 
 	record.zi_error = error;
 
 	ret = register_handler(pool, flags, &record, quiet);
 
+#ifdef HAVE_ZPL
 	if (dataset[0] != '\0' && domount)
 		ret = (zfs_mount(zhp, NULL, 0) != 0);
+#endif /* HAVE_ZPL */
 
 	libzfs_fini(g_zfs);