From: loli10K <loli10K@users.noreply.github.com>
Date: Fri, 5 Jul 2019 23:38:17 +0000 (+0200)
Subject: Fix zfs "redact" misc issues
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b5fe2c351b1ba74ac75199310ad79a7597aa747;p=zfs

Fix zfs "redact" misc issues

* zfs redact error messages do not end with newline character
 * 30af21b0 inadvertently removed some ZFS_PROP comments
 * man/zfs: zfs redact <redaction_snapshot> is not optional

Reviewed-by: Giuseppe Di Natale <guss80@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #8988
---

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index 456a6ca30..d9709ae62 100644
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -3620,7 +3620,7 @@ zfs_do_redact(int argc, char **argv)
 	argv++;
 	argc--;
 	if (argc < 3) {
-		(void) fprintf(stderr, gettext("too few arguments"));
+		(void) fprintf(stderr, gettext("too few arguments\n"));
 		usage(B_FALSE);
 	}
 
@@ -3643,34 +3643,34 @@ zfs_do_redact(int argc, char **argv)
 		break;
 	case ENOENT:
 		(void) fprintf(stderr,
-		    gettext("provided snapshot %s does not exist"), snap);
+		    gettext("provided snapshot %s does not exist\n"), snap);
 		break;
 	case EEXIST:
 		(void) fprintf(stderr, gettext("specified redaction bookmark "
-		    "(%s) provided already exists"), bookname);
+		    "(%s) provided already exists\n"), bookname);
 		break;
 	case ENAMETOOLONG:
 		(void) fprintf(stderr, gettext("provided bookmark name cannot "
-		    "be used, final name would be too long"));
+		    "be used, final name would be too long\n"));
 		break;
 	case E2BIG:
 		(void) fprintf(stderr, gettext("too many redaction snapshots "
-		    "specified"));
+		    "specified\n"));
 		break;
 	case EINVAL:
 		(void) fprintf(stderr, gettext("redaction snapshot must be "
-		    "descendent of snapshot being redacted"));
+		    "descendent of snapshot being redacted\n"));
 		break;
 	case EALREADY:
 		(void) fprintf(stderr, gettext("attempted to redact redacted "
-		    "dataset or with respect to redacted dataset"));
+		    "dataset or with respect to redacted dataset\n"));
 		break;
 	case ENOTSUP:
 		(void) fprintf(stderr, gettext("redaction bookmarks feature "
-		    "not enabled"));
+		    "not enabled\n"));
 		break;
 	default:
-		(void) fprintf(stderr, gettext("internal error: %s"),
+		(void) fprintf(stderr, gettext("internal error: %s\n"),
 		    strerror(errno));
 	}
 
diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h
index 93a3533c3..a9dd8e466 100644
--- a/include/sys/fs/zfs.h
+++ b/include/sys/fs/zfs.h
@@ -118,11 +118,11 @@ typedef enum {
 	ZFS_PROP_PRIVATE,		/* not exposed to user, temporary */
 	ZFS_PROP_ACLINHERIT,
 	ZFS_PROP_CREATETXG,
-	ZFS_PROP_NAME,
+	ZFS_PROP_NAME,			/* not exposed to the user */
 	ZFS_PROP_CANMOUNT,
-	ZFS_PROP_ISCSIOPTIONS,
+	ZFS_PROP_ISCSIOPTIONS,		/* not exposed to the user */
 	ZFS_PROP_XATTR,
-	ZFS_PROP_NUMCLONES,
+	ZFS_PROP_NUMCLONES,		/* not exposed to the user */
 	ZFS_PROP_COPIES,
 	ZFS_PROP_VERSION,
 	ZFS_PROP_UTF8ONLY,
@@ -140,12 +140,12 @@ typedef enum {
 	ZFS_PROP_USEDDS,
 	ZFS_PROP_USEDCHILD,
 	ZFS_PROP_USEDREFRESERV,
-	ZFS_PROP_USERACCOUNTING,
-	ZFS_PROP_STMF_SHAREINFO,
+	ZFS_PROP_USERACCOUNTING,	/* not exposed to the user */
+	ZFS_PROP_STMF_SHAREINFO,	/* not exposed to the user */
 	ZFS_PROP_DEFER_DESTROY,
 	ZFS_PROP_USERREFS,
 	ZFS_PROP_LOGBIAS,
-	ZFS_PROP_UNIQUE,
+	ZFS_PROP_UNIQUE,		/* not exposed to the user */
 	ZFS_PROP_OBJSETID,
 	ZFS_PROP_DEDUP,
 	ZFS_PROP_MLSLABEL,
@@ -156,7 +156,7 @@ typedef enum {
 	ZFS_PROP_CLONES,
 	ZFS_PROP_LOGICALUSED,
 	ZFS_PROP_LOGICALREFERENCED,
-	ZFS_PROP_INCONSISTENT,
+	ZFS_PROP_INCONSISTENT,		/* not exposed to the user */
 	ZFS_PROP_VOLMODE,
 	ZFS_PROP_FILESYSTEM_LIMIT,
 	ZFS_PROP_SNAPSHOT_LIMIT,
diff --git a/man/man8/zfs.8 b/man/man8/zfs.8
index 1659d7a73..3fc142f5e 100644
--- a/man/man8/zfs.8
+++ b/man/man8/zfs.8
@@ -236,7 +236,7 @@
 .Nm
 .Cm redact
 .Ar snapshot redaction_bookmark
-.Op Ar redaction_snapshot Ns ...
+.Ar redaction_snapshot Ns ...
 .Nm
 .Cm allow
 .Ar filesystem Ns | Ns Ar volume
@@ -4274,7 +4274,7 @@ deleting its saved partially received state.
 .Nm
 .Cm redact
 .Ar snapshot redaction_bookmark
-.Op Ar redaction_snapshot Ns ...
+.Ar redaction_snapshot Ns ...
 .Xc
 Generate a new redaction bookmark.
 In addition to the typical bookmark information, a redaction bookmark contains