X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-crypto.c;h=1a0a1055ac34a9d8ced462f6651580457d9c5519;hp=6d01de35d3584894f74f6eaa5eed07672190f0c8;hb=0c8d53e17be600c99e4a8f96062f39306c3ccad8;hpb=037202f194cfed3bd195619d374f88adbd74ea38

diff --git a/libcfs/libcfs/linux/linux-crypto.c b/libcfs/libcfs/linux/linux-crypto.c
index 6d01de3..1a0a105 100644
--- a/libcfs/libcfs/linux/linux-crypto.c
+++ b/libcfs/libcfs/linux/linux-crypto.c
@@ -33,14 +33,12 @@
 #include <libcfs/libcfs_crypto.h>
 #include <libcfs/linux/linux-crypto.h>
 
-#ifndef crypto_ahash_alg_name
+#ifndef HAVE_CRYPTO_HASH_HELPERS
 static inline const char *crypto_ahash_alg_name(struct crypto_ahash *tfm)
 {
 	return crypto_tfm_alg_name(crypto_ahash_tfm(tfm));
 }
-#endif
 
-#ifndef crypto_ahash_driver_name
 static inline const char *crypto_ahash_driver_name(struct crypto_ahash *tfm)
 {
 	return crypto_tfm_alg_driver_name(crypto_ahash_tfm(tfm));
@@ -321,7 +319,8 @@ static void cfs_crypto_performance_test(enum cfs_crypto_hash_alg hash_alg)
 	int			buf_len = max(PAGE_SIZE, 1048576UL);
 	void			*buf;
 	unsigned long		start, end;
-	int			bcount, err = 0;
+	int			err = 0;
+	unsigned long		bcount;
 	struct page		*page;
 	unsigned char		hash[CFS_CRYPTO_HASH_DIGESTSIZE_MAX];
 	unsigned int		hash_len = sizeof(hash);