OpenZFS 9616 - Bogus error when attempting to set property on read-only pool

Authored by: Andrew Stormont <astormont@racktopsystems.com>
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Reviewed by: Matt Ahrens <matt@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>
OpenZFS-issue: https://illumos.org/issues/9616
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/f62db44d
Closes #7974

diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c
index 76a316a9c8f4b6c7b5b0b1394aefdc2b4289a2aa..b6dd4f1666d48b55a7def52d8edfd65557b935a7 100644 (file)
--- a/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@ -29,7 +29,7 @@
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
  * Copyright 2017 Nexenta Systems, Inc.
  * Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>
- * Copyright 2017 RackTop Systems.
+ * Copyright 2017-2018 RackTop Systems.
  */
 
 #include <ctype.h>
@@ -1939,13 +1939,18 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvlist_t *props)
        ret = zfs_ioctl(hdl, ZFS_IOC_SET_PROP, &zc);
 
        if (ret != 0) {
+               if (zc.zc_nvlist_dst_filled == B_FALSE) {
+                       (void) zfs_standard_error(hdl, errno, errbuf);
+                       goto error;
+               }
+
                /* Get the list of unset properties back and report them. */
                nvlist_t *errorprops = NULL;
                if (zcmd_read_dst_nvlist(hdl, &zc, &errorprops) != 0)
                        goto error;
-               for (elem = nvlist_next_nvpair(nvl, NULL);
+               for (nvpair_t *elem = nvlist_next_nvpair(errorprops, NULL);
                    elem != NULL;
-                   elem = nvlist_next_nvpair(nvl, elem)) {
+                   elem = nvlist_next_nvpair(errorprops, elem)) {
                        prop = zfs_name_to_prop(nvpair_name(elem));
                        zfs_setprop_error(hdl, prop, errno, errbuf);
                }