OpenZFS 7614, 9064 - zfs device evacuation/removal

[mirror_zfs.git] / lib / libzfs / libzfs_util.c

diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
index 12f65a90c1bb3fd7b141171fb6b2533bc1078587..855c72fab3ff78997d2de597af76469b46c7388b 100644 (file)
--- a/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@ -261,6 +261,9 @@ libzfs_error_description(libzfs_handle_t *hdl)
                return (dgettext(TEXT_DOMAIN, "invalid diff data"));
        case EZFS_POOLREADONLY:
                return (dgettext(TEXT_DOMAIN, "pool is read-only"));
+       case EZFS_NO_PENDING:
+               return (dgettext(TEXT_DOMAIN, "operation is not "
+                   "in progress"));
        case EZFS_ACTIVE_POOL:
                return (dgettext(TEXT_DOMAIN, "pool is imported on a "
                    "different host"));
@@ -482,6 +485,11 @@ zpool_standard_error_fmt(libzfs_handle_t *hdl, int error, const char *fmt, ...)
                zfs_verror(hdl, EZFS_BUSY, fmt, ap);
                break;
 
+       /* There is no pending operation to cancel */
+       case ENOTACTIVE:
+               zfs_verror(hdl, EZFS_NO_PENDING, fmt, ap);
+               break;
+
        case ENXIO:
                zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
                    "one or more devices is currently unavailable"));