summaryrefslogtreecommitdiffstats
path: root/drivers/staging/lustre/include
diff options
context:
space:
mode:
authorAndreas Dilger <andreas.dilger@intel.com>2016-03-26 15:40:47 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-29 12:06:51 -0700
commit4d60ffa12c887e1944d5582d79cc9d7f3593eb00 (patch)
tree07fb39e90edafbe826d2b05e5d6d9c711efbf351 /drivers/staging/lustre/include
parent020b02154d79e1e01f846da7a6beab59fd7c7840 (diff)
downloadop-kernel-dev-4d60ffa12c887e1944d5582d79cc9d7f3593eb00.zip
op-kernel-dev-4d60ffa12c887e1944d5582d79cc9d7f3593eb00.tar.gz
staging: lustre: libcfs: rename some variables for crypto handling
For the crypto algorthim type use the same name hash_alg everywhere. Signed-off-by: Andreas Dilger <andreas.dilger@intel.com> Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5053 Reviewed-on: http://review.whamcloud.com/9990 Reviewed-by: Bob Glossman <bob.glossman@intel.com> Reviewed-by: James Simmons <uja.ornl@gmail.com> Reviewed-by: Oleg Drokin <oleg.drokin@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/include')
-rw-r--r--drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h
index 5182416..0782bfb 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h
@@ -134,7 +134,7 @@ static inline unsigned char cfs_crypto_hash_alg(const char *algname)
return (i == CFS_HASH_ALG_MAX ? 0xFF : i);
}
-int cfs_crypto_hash_digest(unsigned char alg,
+int cfs_crypto_hash_digest(unsigned char hash_alg,
const void *buf, unsigned int buf_len,
unsigned char *key, unsigned int key_len,
unsigned char *hash, unsigned int *hash_len);
@@ -143,7 +143,7 @@ int cfs_crypto_hash_digest(unsigned char alg,
struct cfs_crypto_hash_desc;
struct cfs_crypto_hash_desc*
- cfs_crypto_hash_init(unsigned char alg,
+ cfs_crypto_hash_init(unsigned char hash_alg,
unsigned char *key, unsigned int key_len);
int cfs_crypto_hash_update_page(struct cfs_crypto_hash_desc *desc,
struct page *page, unsigned int offset,
OpenPOWER on IntegriCloud