6385436 zfs set <property> returns an error, but still sets property value (fix build)

1 files changed, 12 insertions, 2 deletions

diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c
index 0fba9046bd..4187d8b506 100644
--- a/usr/src/cmd/zfs/zfs_main.c
+++ b/usr/src/cmd/zfs/zfs_main.c
@@ -1636,9 +1636,19 @@ set_callback(zfs_handle_t *zhp, void *data)
 		}
 	}
 
-	if (zfs_prop_set(zhp, cbp->cb_prop, cbp->cb_value) != 0)
+	if (zfs_prop_set(zhp, cbp->cb_prop, cbp->cb_value) != 0) {
+		switch (libzfs_errno(g_zfs)) {
+		case EZFS_MOUNTFAILED:
+			(void) fprintf(stderr, gettext("property may be set "
+			    "but unable to remount filesystem\n"));
+			break;
+		case EZFS_SHAREFAILED:
+			(void) fprintf(stderr, gettext("property may be set "
+			    "but unable to reshare filesystem\n"));
+			break;
+		}
 		return (1);
-
+	}
 	ret = 0;
 error:
 	return (ret);