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.
In fact, we just copied kernel's implementation. So drop it
and select kernel crypto in Kconfig.

Signed-off-by: Peng Tao <tao.peng@emc.com>
  • Loading branch information
@bergwolf
bergwolf committed Jun 5, 2013
1 parent a204673 commit 146844d
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
View file
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
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
View file
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
View file

This file was deleted.

Loading

2 comments on commit 146844d

@adilger
Copy link

@adilger adilger commented on 146844d Jun 5, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be more correct, this is not actually a copy of the kernel code, but rather code that was developed for Lustre and then merged into the upstream kernel. It would be better to have a commit comment like:

The crc32-pclmul support was merged into the 3.8 kernel in commit 78c37d1,
no need to keep a local copy in Lustre anymore.

@bergwolf
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I will fix up the commit message before sending out.

Please sign in to comment.