Brian's feedback

Signed-off-by: Paul Dagnelie <[email protected]>

Author: Paul Dagnelie

lib/libzfs/libzfs_pool.c

@@ -2761,6 +2761,11 @@ zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func, pool_scrub_cmd_t cmd)
 	 * 1. we resumed a paused scrub.
 	 * 2. we resumed a paused error scrub.
 	 * 3. Error scrub is not run because of no error log.
+	 *
+	 * Note that we no longer return ECANCELED in case 1 or 2, but in order
+	 * to prevent problems where we have a newer userland than kernel, we
+	 * keep this check in place to prevent erroneous failures when an older
+	 * kernel returns ECANCLED in those cases.
 	 */
 	if (err == ECANCELED && (func == POOL_SCAN_SCRUB ||
 	    func == POOL_SCAN_ERRORSCRUB) && cmd == POOL_SCRUB_NORMAL)