staging: lustre: make include/linux/libcfs/linux/linux-crypto.h private

There are only 2 functions that are actually called from it, so move it
to the local place where it is needed, no need for it to be "global" for
the rest of lustre to see it.

Also remove the unneeded EXPORT_SYMBOL() markings for these functions,
as no one else calls them.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c
index 20b2d61..5e185fa 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c
@@ -32,12 +32,11 @@
 #include <linux/module.h>
 #include <linux/zutil.h>
 #include <crypto/internal/hash.h>
-
+#include "linux-crypto.h"
 
 #define CHKSUM_BLOCK_SIZE      1
 #define CHKSUM_DIGEST_SIZE     4
 
-
 static u32 __adler32(u32 cksum, unsigned char const *p, size_t len)
 {
        return zlib_adler32(cksum, p, len);
@@ -135,10 +134,8 @@ int cfs_crypto_adler32_register(void)
 {
        return crypto_register_shash(&alg);
 }
-EXPORT_SYMBOL(cfs_crypto_adler32_register);
 
 void cfs_crypto_adler32_unregister(void)
 {
        crypto_unregister_shash(&alg);
 }
-EXPORT_SYMBOL(cfs_crypto_adler32_unregister);

diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
index 048a4f2..aa3fffe 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
@@ -30,7 +30,7 @@
 #include <linux/crypto.h>
 #include <linux/scatterlist.h>
 #include "../../../include/linux/libcfs/libcfs.h"
-#include "../../../include/linux/libcfs/linux/linux-crypto.h"
+#include "linux-crypto.h"
 /**
  *  Array of  hash algorithm speed in MByte per second
  */

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-crypto.h b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.h
similarity index 72%
rename from drivers/staging/lustre/include/linux/libcfs/linux/linux-crypto.h
rename to drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.h
index 97c771c..18e8cd4 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-crypto.h
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.h
@@ -22,28 +22,8 @@
  * GPL HEADER END
  */
 
-/*
- * Copyright 2012 Xyratex Technology Limited
- */
-
-/**
- * Linux crypto hash specific functions.
- */
-
-/**
- * Functions for start/stop shash CRC32 algorithm.
- */
-int cfs_crypto_crc32_register(void);
-void cfs_crypto_crc32_unregister(void);
-
 /**
  * Functions for start/stop shash adler32 algorithm.
  */
 int cfs_crypto_adler32_register(void);
 void cfs_crypto_adler32_unregister(void);
-
-/**
- * Functions for start/stop shash crc32 pclmulqdq
- */
-int cfs_crypto_crc32_pclmul_register(void);
-void cfs_crypto_crc32_pclmul_unregister(void);