aboutsummaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorAllan Jude <[email protected]>2020-08-01 11:41:31 -0400
committerGitHub <[email protected]>2020-08-01 08:41:31 -0700
commit8fb79fdddb076036a006e19f4e1b93b3baf72498 (patch)
tree9327b9f3a9b6dd1efb12778e74de7a34567f1856 /module
parent47ed79ff60945e0c5d8ccb56f0d29a893e1261ac (diff)
Change the error handling for invalid property values
ZFS recv should return a useful error message when an invalid index property value is provided in the send stream properties nvlist With a compression= property outside of the understood range: Before: ``` receiving full stream of zof/zstd_send@send2 into testpool/recv@send2 internal error: Invalid argument Aborted (core dumped) ``` Note: the recv completes successfully, the abort() is likely just to make it easier to track the unexpected error code. After: ``` receiving full stream of zof/zstd_send@send2 into testpool/recv@send2 cannot receive compression property on testpool/recv: invalid property value received 28.9M stream in 1 seconds (28.9M/sec) ``` Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Allan Jude <[email protected]> Closes #10631
Diffstat (limited to 'module')
-rw-r--r--module/zfs/zfs_ioctl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 672eec9cc..d0d5207b4 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -2591,7 +2591,8 @@ retry:
case PROP_TYPE_INDEX:
if (zfs_prop_index_to_string(prop,
intval, &unused) != 0)
- err = SET_ERROR(EINVAL);
+ err =
+ SET_ERROR(ZFS_ERR_BADPROP);
break;
default:
cmn_err(CE_PANIC,