Illumos 4373 - add block contents print to zstreamdump

[mirror_zfs.git] / cmd / zfs / zfs_main.c

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index 84073435e2d769fa1c20899a21eec32ec150ebcf..c361e18b9faad5b4561f7013edee4790d9d8ec46 100644 (file)
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -1903,9 +1903,13 @@ zfs_do_inherit(int argc, char **argv)
                        if (prop == ZFS_PROP_QUOTA ||
                            prop == ZFS_PROP_RESERVATION ||
                            prop == ZFS_PROP_REFQUOTA ||
-                           prop == ZFS_PROP_REFRESERVATION)
+                           prop == ZFS_PROP_REFRESERVATION) {
                                (void) fprintf(stderr, gettext("use 'zfs set "
                                    "%s=none' to clear\n"), propname);
+                               (void) fprintf(stderr, gettext("use 'zfs "
+                                   "inherit -S %s' to revert to received "
+                                   "value\n"), propname);
+                       }
                        return (1);
                }
                if (received && (prop == ZFS_PROP_VOLSIZE ||
@@ -6657,6 +6661,8 @@ main(int argc, char **argv)
        (void) setlocale(LC_ALL, "");
        (void) textdomain(TEXT_DOMAIN);
 
+       dprintf_setup(&argc, argv);
+
        opterr = 0;
 
        /*