diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c')
| -rw-r--r-- | drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c index fbbc8a7e308d..079d50ebfa3a 100644 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c @@ -36,8 +36,6 @@ */ static int cfs_crypto_hash_speeds[CFS_HASH_ALG_MAX]; - - static int cfs_crypto_hash_alloc(unsigned char alg_id, const struct cfs_crypto_hash_type **type, struct hash_desc *desc, unsigned char *key, @@ -71,13 +69,12 @@ static int cfs_crypto_hash_alloc(unsigned char alg_id, * Skip this function for digest, because we use shash logic at * cfs_crypto_hash_alloc. */ - if (key != NULL) { + if (key != NULL) err = crypto_hash_setkey(desc->tfm, key, key_len); - } else if ((*type)->cht_key != 0) { + else if ((*type)->cht_key != 0) err = crypto_hash_setkey(desc->tfm, (unsigned char *)&((*type)->cht_key), (*type)->cht_size); - } if (err != 0) { crypto_free_hash(desc->tfm); @@ -225,6 +222,7 @@ static void cfs_crypto_performance_test(unsigned char alg_id, cfs_crypto_hash_name(alg_id), err); } else { unsigned long tmp; + tmp = ((bcount * buf_len / jiffies_to_msecs(end - start)) * 1000) / (1024 * 1024); cfs_crypto_hash_speeds[alg_id] = (int)tmp; @@ -282,6 +280,7 @@ int cfs_crypto_register(void) cfs_crypto_test_hashes(); return 0; } + void cfs_crypto_unregister(void) { if (adler32 == 0) |