From 5b525165e9113e7faabd230b504ae4e9b85d35a5 Mon Sep 17 00:00:00 2001 From: John Poduska Date: Fri, 2 Oct 2020 20:40:46 -0400 Subject: Mismatched nvlist names in zfs_keys_send_space This causes "zfs send -vt ..." to fail with: cannot resume send: Unknown error 1030 It turns out that some of the name/value pairs in the verification list for zfs_ioc_send_space(), zfs_keys_send_space, had the wrong name, so the ioctl got kicked out in zfs_check_input_nvpairs(). Update the names accordingly. Reviewed-by: Brian Behlendorf Reviewed-by: Ryan Moeller Signed-off-by: John Poduska Closes #10978 --- module/zfs/zfs_ioctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'module') diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index eff66b32f..d2550750c 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -6429,8 +6429,10 @@ send_space_sum(objset_t *os, void *buf, int len, void *arg) * presence indicates DRR_WRITE_EMBEDDED records are permitted * (optional) "compressok" -> (value ignored) * presence indicates compressed DRR_WRITE records are permitted - * (optional) "rawok" -> (value ignored) + * (optional) "rawok" -> (value ignored) * presence indicates raw encrypted records should be used. + * (optional) "resume_object" and "resume_offset" -> (uint64) + * if present, resume send stream from specified object and offset. * (optional) "fd" -> file descriptor to use as a cookie for progress * tracking (int32) * } @@ -6448,9 +6450,9 @@ static const zfs_ioc_key_t zfs_keys_send_space[] = { {"rawok", DATA_TYPE_BOOLEAN, ZK_OPTIONAL}, {"fd", DATA_TYPE_INT32, ZK_OPTIONAL}, {"redactbook", DATA_TYPE_STRING, ZK_OPTIONAL}, - {"resumeobj", DATA_TYPE_UINT64, ZK_OPTIONAL}, - {"resumeoff", DATA_TYPE_UINT64, ZK_OPTIONAL}, - {"bytes", DATA_TYPE_UINT64, ZK_OPTIONAL}, + {"resume_object", DATA_TYPE_UINT64, ZK_OPTIONAL}, + {"resume_offset", DATA_TYPE_UINT64, ZK_OPTIONAL}, + {"bytes", DATA_TYPE_UINT64, ZK_OPTIONAL}, }; static int -- cgit v1.2.3