Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build errors #7

Closed
wants to merge 5 commits into from
Closed

Fix build errors #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6d0dbf
staging/lustre: call set_cpus_allowed_ptr instead of set_cpus_allowed
bergwolf Jun 5, 2013
cc8bb00
staging/lustre: remove lu_context_keys_dump and lu_debugging_setup
bergwolf Jun 5, 2013
00e72ff
staging/lustre/libcfs: restore LINVRNT
bergwolf Jun 5, 2013
a204673
staging/lustre: surround module_refcount with CONFIG_MODULE_UNLOAD
bergwolf Jun 5, 2013
146844d
staging/lustre/libcfs: cleanup linux-crypto
bergwolf Jun 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,16 @@ do { \

#define LASSERT(cond) LASSERTF(cond, "\n")

#ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
/**
* This is for more expensive checks that one doesn't want to be enabled all
* the time. LINVRNT() has to be explicitly enabled by
* CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK option.
*/
# define LINVRNT(exp) LASSERT(exp)
#else
# define LINVRNT(exp) ((void)sizeof!!(exp))
#endif

#define KLASSERT(e) LASSERT(e)

Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@
#define NR_CPUS 1
#endif

#define cfs_set_cpus_allowed(t, mask) set_cpus_allowed(t, mask)

/*
* cache
*/
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ int proc_call_handler(void *data, int write,
#define NR_CPUS 1
#endif

#define cfs_set_cpus_allowed(t, mask) set_cpus_allowed(t, mask)

#define cfs_register_sysctl_table(t, a) register_sysctl_table(t)

#endif /* _PORTALS_COMPAT_H */
18 changes: 18 additions & 0 deletions drivers/staging/lustre/lustre/Kconfig
View file
Open in desktop
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 Expand Up @@ -31,3 +39,13 @@ config LUSTRE_OBD_MAX_IOCTL_BUFFER
applications can pass to Lustre kernel module through ioctl interface.

If unsure, use default.

config LUSTRE_DEBUG_EXPENSIVE_CHECK
bool "Enable Lustre DEBUG checks"
depends on LUSTRE_FS
default false
help
This option is mainly for debug purpose. It enables Lustre code to do
expensive checks that may have a performance impact.

Use with caution. If unsure, use default.
5 changes: 2 additions & 3 deletions drivers/staging/lustre/lustre/libcfs/Makefile
View file
Open in desktop
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
Loading