diff options
| author | Jason King <jason.brian.king@gmail.com> | 2021-11-05 09:48:07 -0500 |
|---|---|---|
| committer | Jason King <jason.brian.king@gmail.com> | 2021-11-19 15:27:15 -0600 |
| commit | d8f839f91e21bea2f5200f95df55608cbecdeeb9 (patch) | |
| tree | e346867b613449eeb87674a39fc76497eb3f3bd9 /usr/src/uts/common/fs/zfs/dsl_crypt.c | |
| parent | 705b6680745618ebbf67feb254ce9a62511084a5 (diff) | |
| download | illumos-joyent-d8f839f91e21bea2f5200f95df55608cbecdeeb9.tar.gz | |
14223 Add change key zfs channel program
Portions contributed by: Alex Wilson <alex@cooperi.net>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Dan McDonald <danmcd@joyent.com>
Reviewed by: Mike Zeller <mike.zeller@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/uts/common/fs/zfs/dsl_crypt.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/dsl_crypt.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/usr/src/uts/common/fs/zfs/dsl_crypt.c b/usr/src/uts/common/fs/zfs/dsl_crypt.c index cb412151e7..ed98740f1d 100644 --- a/usr/src/uts/common/fs/zfs/dsl_crypt.c +++ b/usr/src/uts/common/fs/zfs/dsl_crypt.c @@ -1220,12 +1220,7 @@ dsl_crypto_key_sync(dsl_crypto_key_t *dck, dmu_tx_t *tx) tx); } -typedef struct spa_keystore_change_key_args { - const char *skcka_dsname; - dsl_crypto_params_t *skcka_cp; -} spa_keystore_change_key_args_t; - -static int +int spa_keystore_change_key_check(void *arg, dmu_tx_t *tx) { int ret; @@ -1501,7 +1496,7 @@ spa_keystore_change_key_sync_impl(uint64_t rddobj, uint64_t ddobj, dsl_dir_rele(dd, FTAG); } -static void +void spa_keystore_change_key_sync(void *arg, dmu_tx_t *tx) { dsl_dataset_t *ds; |