Skip to content

Commit

Permalink
staging/lustre/libcfs: cleanup linux-crypto
Browse files Browse the repository at this point in the history
We don't need to implement crc32 and crc32pclmul on our own.
The crc32-pclmul support was merged into the 3.8 kernel in commit
78c37d1, no need to keep a local copy in Lustre anymore.
The crc32 implementation is identical to crypto-crc32. So drop
Lustre's private implementation and select kernel crypto in Kconfig.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Peng Tao authored and Greg Kroah-Hartman committed Jun 6, 2013
1 parent 4a1a01e commit 9c782da
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 722 deletions.
8 changes: 8 additions & 0 deletions drivers/staging/lustre/lustre/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ config LUSTRE_FS
tristate "Lustre file system client support"
depends on STAGING && INET && BROKEN
select LNET
select CRYPTO
select CRYPTO_CRC32
select CRYPTO_CRC32_PCLMUL if X86
select CRYPTO_CRC32C
select CRYPTO_MD5
select CRYPTO_SHA1
select CRYPTO_SHA256
select CRYPTO_SHA512
help
This option enables Lustre file system client support. Choose Y
here if you want to access a Lustre file system cluster. To compile
Expand Down
5 changes: 2 additions & 3 deletions drivers/staging/lustre/lustre/libcfs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@ libcfs-linux-objs += linux-prim.o linux-cpu.o
libcfs-linux-objs += linux-tcpip.o
libcfs-linux-objs += linux-proc.o linux-curproc.o
libcfs-linux-objs += linux-module.o
libcfs-linux-objs += linux-crypto.o linux-crypto-crc32.o
libcfs-linux-objs += linux-crypto.o
libcfs-linux-objs += linux-crypto-adler.o
libcfs-linux-objs += linux-crypto-crc32pclmul.o

libcfs-linux-objs := $(addprefix linux/,$(libcfs-linux-objs))

libcfs-all-objs := debug.o fail.o nidstrings.o module.o tracefile.o \
watchdog.o libcfs_string.o hash.o kernel_user_comm.o \
prng.o workitem.o upcall_cache.o libcfs_cpu.o \
libcfs_mem.o libcfs_lock.o crc32-pclmul_asm.o
libcfs_mem.o libcfs_lock.o

libcfs-objs := $(libcfs-linux-objs) $(libcfs-all-objs)

Expand Down
360 changes: 0 additions & 360 deletions drivers/staging/lustre/lustre/libcfs/crc32-pclmul_asm.S

This file was deleted.

Loading

0 comments on commit 9c782da

Please sign in to comment.