diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-26 13:19:09 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-26 13:19:09 +0000 |
| commit | 356e1b4941ba70261404f9bb0255f70891042331 (patch) | |
| tree | 0a90f7528e59ef62debe0cf5c2ecd3f2dd202494 /usr/src/cmd/truss/codes.c | |
| parent | d152c784e9ec5ececac97129ea92fe6afc57078c (diff) | |
| parent | 2d6125aab2c7deca41a7689dae14eb32ec909f49 (diff) | |
| download | illumos-joyent-356e1b4941ba70261404f9bb0255f70891042331.tar.gz | |
[illumos-gate merge]
commit 2d6125aab2c7deca41a7689dae14eb32ec909f49
11272 libprint: move declaration of ns_kvp_destroy() into ns.h
commit 1998b0812b5fb5da180a47adadb55cc844465828
11261 efinet: Defer exclusively opening the network handles
commit e41409bfa05152ed1ac94578d69a0444e4ab6904
11168 krb5: NULL pointer errors
commit 229945d3d7718e50413d46140ea34f0e9c195c16
11160 pylibbe: NULL pointer errors
commit 47f78bf40e94882d167f6132e5dc25ffed0be6e5
11157 libbe: NULL pointer errors
commit e2e372a44e0036831b4a1b5f80a7c680223275fa
11154 pkcs11_tpm: NULL pointer errors
commit 4b788a9f64f8a617e410f058ca415898b54c3ab9
11153 pkcs11_softtoken: NULL pointer errors
commit 798d97d364cf412f7586e489b227851115381696
11152 pkcs11_kernel: NULL pointer errors
commit a6313a9d1cea800172e9672443e1496d90d4fbcf
11119 libumem: NULL pointer errors
commit eb633035c80613ec93d62f90482837adaaf21a0a
8727 Native data and metadata encryption for zfs
Conflicts:
usr/src/uts/common/fs/zfs/dmu_recv.c
Diffstat (limited to 'usr/src/cmd/truss/codes.c')
| -rw-r--r-- | usr/src/cmd/truss/codes.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/usr/src/cmd/truss/codes.c b/usr/src/cmd/truss/codes.c index ac49896686..888e6c9caf 100644 --- a/usr/src/cmd/truss/codes.c +++ b/usr/src/cmd/truss/codes.c @@ -1294,6 +1294,12 @@ const struct ioc { "zfs_cmd_t" }, { (uint_t)ZFS_IOC_POOL_SYNC, "ZFS_IOC_POOL_SYNC", "zfs_cmd_t" }, + { (uint_t)ZFS_IOC_LOAD_KEY, "ZFS_IOC_LOAD_KEY", + "zfs_cmd_t" }, + { (uint_t)ZFS_IOC_UNLOAD_KEY, "ZFS_IOC_UNLOAD_KEY", + "zfs_cmd_t" }, + { (uint_t)ZFS_IOC_CHANGE_KEY, "ZFS_IOC_CHANGE_KEY", + "zfs_cmd_t" }, /* kssl ioctls */ { (uint_t)KSSL_ADD_ENTRY, "KSSL_ADD_ENTRY", |