svn commit: r339119 - in stable/11/cddl/contrib/opensolaris: cmd/zfs lib/libzfs/common

[Alexander Motin]

Author: mav
Date: Wed Oct  3 03:13:53 2018
New Revision: 339119
URL: https://svnweb.freebsd.org/changeset/base/339119

Log:
  MFC r337163: MFV r337161: 9512 zfs remap poolname at snapname coredumps
  
  Only filesystems and volumes are valid "zfs remap" parameters: when passed
  a snapshot name zfs_remap_indirects() does not handle the EINVAL returned
  from libzfs_core, which results in failing an assertion and consequently
  crashing.
  
  illumos/illumos-gate at 0b2e8253986c5c761129b58cfdac46d204903de1
  
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: John Wren Kennedy <john.kennedy at delphix.com>
  Reviewed by: Sara Hartse <sara.hartse at delphix.com>
  Approved by: Matt Ahrens <mahrens at delphix.com>
  Author:     loli10K <ezomori.nozomu at gmail.com>

Modified:
  stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Wed Oct  3 02:52:47 2018	(r339118)
+++ stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Wed Oct  3 03:13:53 2018	(r339119)
@@ -7038,11 +7038,28 @@ zfs_do_diff(int argc, char **argv)
 	return (err != 0);
 }
 
+/*
+ * zfs remap <filesystem | volume>
+ *
+ * Remap the indirect blocks in the given fileystem or volume.
+ */
 static int
 zfs_do_remap(int argc, char **argv)
 {
 	const char *fsname;
 	int err = 0;
+	int c;
+
+	/* check options */
+	while ((c = getopt(argc, argv, "")) != -1) {
+		switch (c) {
+		case '?':
+			(void) fprintf(stderr,
+			    gettext("invalid option '%c'\n"), optopt);
+			usage(B_FALSE);
+		}
+	}
+
 	if (argc != 2) {
 		(void) fprintf(stderr, gettext("wrong number of arguments\n"));
 		usage(B_FALSE);

Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Wed Oct  3 02:52:47 2018	(r339118)
+++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Wed Oct  3 03:13:53 2018	(r339119)
@@ -3917,12 +3917,24 @@ zfs_remap_indirects(libzfs_handle_t *hdl, const char *
 	char errbuf[1024];
 
 	(void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
-	    "cannot remap filesystem '%s' "), fs);
+	    "cannot remap dataset '%s'"), fs);
 
 	err = lzc_remap(fs);
 
 	if (err != 0) {
-		(void) zfs_standard_error(hdl, err, errbuf);
+		switch (err) {
+		case ENOTSUP:
+			zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+			    "pool must be upgraded"));
+			(void) zfs_error(hdl, EZFS_BADVERSION, errbuf);
+			break;
+		case EINVAL:
+			(void) zfs_error(hdl, EZFS_BADTYPE, errbuf);
+			break;
+		default:
+			(void) zfs_standard_error(hdl, err, errbuf);
+			break;
+		}
 	}
 
 	return (err);