From b83b016c487ce5c9793cc75a230adec54a2d95af Mon Sep 17 00:00:00 2001 From: James Simmons Date: Sun, 28 Aug 2016 15:58:17 -0400 Subject: [PATCH] LU-8560 lustre: remove unused crypto handlers in lustre_compat.h The unused crypto code in lustre_compat.h doesn't build with linux kernel version 4.6+. Since its not used just delete it. Test-Parameters: trivial Change-Id: If7634428357837372f4756b0ace3af9c2cd77366 Signed-off-by: James Simmons Reviewed-on: http://review.whamcloud.com/22204 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Frank Zago Reviewed-by: Dmitry Eremin Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin --- lustre/include/lustre_compat.h | 25 ------------------------- lustre/ptlrpc/gss/gss_internal.h | 1 + 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/lustre/include/lustre_compat.h b/lustre/include/lustre_compat.h index ce704ac..2bfafe1 100644 --- a/lustre/include/lustre_compat.h +++ b/lustre/include/lustre_compat.h @@ -135,31 +135,6 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt, #define FS_HAS_FIEMAP (0) #endif -/* add a lustre compatible layer for crypto API */ -#include -static inline int ll_crypto_hmac(struct crypto_hash *tfm, - u8 *key, unsigned int *keylen, - struct scatterlist *sg, - unsigned int size, u8 *result) -{ - struct hash_desc desc; - int rv; - desc.tfm = tfm; - desc.flags = 0; - rv = crypto_hash_setkey(desc.tfm, key, *keylen); - if (rv) { - CERROR("failed to hash setkey: %d\n", rv); - return rv; - } - return crypto_hash_digest(&desc, sg, size, result); -} - -static inline -unsigned int ll_crypto_tfm_alg_min_keysize(struct crypto_blkcipher *tfm) -{ - return crypto_blkcipher_tfm(tfm)->__crt_alg->cra_blkcipher.min_keysize; -} - #ifndef HAVE_SIMPLE_SETATTR #define simple_setattr(dentry, ops) inode_setattr((dentry)->d_inode, ops) #endif diff --git a/lustre/ptlrpc/gss/gss_internal.h b/lustre/ptlrpc/gss/gss_internal.h index 0c95d8d..02a00b7 100644 --- a/lustre/ptlrpc/gss/gss_internal.h +++ b/lustre/ptlrpc/gss/gss_internal.h @@ -11,6 +11,7 @@ #ifndef __PTLRPC_GSS_GSS_INTERNAL_H_ #define __PTLRPC_GSS_GSS_INTERNAL_H_ +#include #include /* -- 1.8.3.1