summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Wilson <alex@cooperi.net>2021-04-21 01:18:25 +1000
committerGitHub <noreply@github.com>2021-04-20 11:18:25 -0400
commit85104c60d96c6aeac4633b3885c309b0149f8d15 (patch)
tree94f9250abefa60815d54f1761ff8e9171667f684
parent2d70679c470f43047fca8f4961628b78912d8041 (diff)
downloadillumos-joyent-85104c60d96c6aeac4633b3885c309b0149f8d15.tar.gz
OS-8282 zfs_ioc_channel_program with hidden_args returns ZFS_ERR_IOC_ARG_UNAVAIL
Reviewed by: Dan McDonald <danmcd@joyent.com> Reviewed by: Mike Zeller <mike.zeller@joyent.com> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/uts/common/fs/zfs/zfs_ioctl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_ioctl.c b/usr/src/uts/common/fs/zfs/zfs_ioctl.c
index 6c0f5181c7..792fe025eb 100644
--- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c
+++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c
@@ -37,6 +37,7 @@
* Copyright (c) 2017, loli10K <ezomori.nozomu@gmail.com>. All rights reserved.
* Copyright 2017 RackTop Systems.
* Copyright (c) 2017, Datto, Inc. All rights reserved.
+ * Copyright 2021 The University of Queensland
*/
/*
@@ -3875,6 +3876,7 @@ zfs_ioc_destroy_bookmarks(const char *poolname, nvlist_t *innvl,
static const zfs_ioc_key_t zfs_keys_channel_program[] = {
{"program", DATA_TYPE_STRING, 0},
{"arg", DATA_TYPE_ANY, 0},
+ {"hidden_args", DATA_TYPE_ANY, ZK_OPTIONAL},
{"sync", DATA_TYPE_BOOLEAN_VALUE, ZK_OPTIONAL},
{"instrlimit", DATA_TYPE_UINT64, ZK_OPTIONAL},
{"memlimit", DATA_TYPE_UINT64, ZK_OPTIONAL},