Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1364993 > unrolled thread

[PATCH 00/12] Bring the libcfs crypto code up to date

Back to article view | Back to linux.kernel

Contents

  [PATCH 00/12] Bring the libcfs crypto code up to date James Simmons <jsimmons@infradead.org> - 2016-03-26 20:50 +0100
    [PATCH 01/12] staging: lustre: libcfs: limit scope of libcfs_crypto.h James Simmons <jsimmons@infradead.org> - 2016-03-26 20:50 +0100

#1364993 — [PATCH 00/12] Bring the libcfs crypto code up to date

Several important fixes for the crypto handling are missing for
the upstream client. This work integates those missing fixes.

Andreas Dilger (12):
  staging: lustre: libcfs: limit scope of libcfs_crypto.h
  staging: lustre: libcfs: add documentation for cfs_crypto_hash_*()
  staging: lustre: libcfs: rename some variables for crypto handling
  staging: lustre: libcfs: add new definitions for cfs_crypto api
  staging: lustre: libcfs: small alignment change for cfs_crypto_hash_*()
  staging: lustre: libcfs: start using enum cfs_crypto_hash_alg
  staging: lustre: libcfs: bug fixes for cfs_crypto_hash_final()
  staging: lustre: libcfs: return proper error code for cfs_crypto_hash_speed()
  staging: lustre: libcfs: allocate memory in cfs_crypto_performance_test()
  staging: lustre: libcfs: print crypto performance result only on success
  staging: lustre: libcfs: improve reporting error for crypto performance
  staging: lustre: libcfs: calculate crypto performance using pages

 .../staging/lustre/include/linux/libcfs/libcfs.h   |    1 -
 .../lustre/include/linux/libcfs/libcfs_crypto.h    |  136 ++++------
 .../lustre/lnet/libcfs/linux/linux-crypto.c        |  274 +++++++++++++++-----
 drivers/staging/lustre/lustre/include/obd_cksum.h  |    1 +
 drivers/staging/lustre/lustre/osc/osc_request.c    |    5 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c    |   12 +-
 6 files changed, 270 insertions(+), 159 deletions(-)

[toc] | [next] | [standalone]

#1364994 — [PATCH 01/12] staging: lustre: libcfs: limit scope of libcfs_crypto.h

From: Andreas Dilger <andreas.dilger@intel.com>

Remove <libcfs/libcfs_crypto.h> from <libcfs/libcfs.h> and only
include it into the places where it is actually needed.  This
works out to be the same places as <obd_cksum.h>, so put it there.

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>
---
 .../staging/lustre/include/linux/libcfs/libcfs.h   |    1 -
 .../lustre/lnet/libcfs/linux/linux-crypto.c        |    1 +
 drivers/staging/lustre/lustre/include/obd_cksum.h  |    1 +
 3 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
index 6a8e0d0..d2e4361 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
@@ -96,7 +96,6 @@ void cfs_get_random_bytes(void *buf, int size);
 #include "libcfs_workitem.h"
 #include "libcfs_hash.h"
 #include "libcfs_fail.h"
-#include "libcfs_crypto.h"
 
 struct libcfs_ioctl_handler {
 	struct list_head item;
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
index 8c9377e..d4cb260 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
@@ -30,6 +30,7 @@
 #include <crypto/hash.h>
 #include <linux/scatterlist.h>
 #include "../../../include/linux/libcfs/libcfs.h"
+#include "../../../include/linux/libcfs/libcfs_crypto.h"
 #include "linux-crypto.h"
 /**
  *  Array of  hash algorithm speed in MByte per second
diff --git a/drivers/staging/lustre/lustre/include/obd_cksum.h b/drivers/staging/lustre/lustre/include/obd_cksum.h
index 637fa22..f6c18df 100644
--- a/drivers/staging/lustre/lustre/include/obd_cksum.h
+++ b/drivers/staging/lustre/lustre/include/obd_cksum.h
@@ -35,6 +35,7 @@
 #ifndef __OBD_CKSUM
 #define __OBD_CKSUM
 #include "../../include/linux/libcfs/libcfs.h"
+#include "../../include/linux/libcfs/libcfs_crypto.h"
 #include "lustre/lustre_idl.h"
 
 static inline unsigned char cksum_obd2cfs(enum cksum_type cksum_type)
-- 
1.7.1

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web