summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--module/zfs/zio_crypt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/module/zfs/zio_crypt.c b/module/zfs/zio_crypt.c
index 2533aee13..eb781b64f 100644
--- a/module/zfs/zio_crypt.c
+++ b/module/zfs/zio_crypt.c
@@ -559,6 +559,8 @@ zio_crypt_key_unwrap(crypto_key_t *cwkey, uint64_t crypt, uint64_t version,
ASSERT3U(crypt, <, ZIO_CRYPT_FUNCTIONS);
ASSERT3U(cwkey->ck_format, ==, CRYPTO_KEY_RAW);
+ rw_init(&key->zk_salt_lock, NULL, RW_DEFAULT, NULL);
+
keydata_len = zio_crypt_table[crypt].ci_keylen;
/* initialize uio_ts */
@@ -640,7 +642,6 @@ zio_crypt_key_unwrap(crypto_key_t *cwkey, uint64_t crypt, uint64_t version,
key->zk_version = version;
key->zk_guid = guid;
key->zk_salt_count = 0;
- rw_init(&key->zk_salt_lock, NULL, RW_DEFAULT, NULL);
return (0);