Commit 2acf8359 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

staging: lustre: remove cruft from libcfs/linux/libcfs.h 



These defines are unused or nearly unused, and do not
help at all.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Reviewed-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 346544d8

drivers/staging/lustre/include/linux/libcfs/curproc.h

+0 −2
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ 
/*

 * Plus, platform-specific constant

 *

 * CFS_CURPROC_COMM_MAX,

 *

 * and opaque scalar type

 *

 * kernel_cap_t

drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h

+0 −17
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ 
#include <stdarg.h>

#include "linux-cpu.h"



#define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5)



#if !defined(__x86_64__)

# ifdef __ia64__

#  define CDEBUG_STACK() (THREAD_SIZE -				 \
@@ -114,19 +112,4 @@ do { \ 
#define CDEBUG_STACK() (0L)

#endif /* __x86_64__ */



#define __current_nesting_level() (0)



/**

 * Platform specific declarations for cfs_curproc API (libcfs/curproc.h)

 *

 * Implementation is in linux-curproc.c

 */

#define CFS_CURPROC_COMM_MAX (sizeof((struct task_struct *)0)->comm)



#include <linux/capability.h>



#ifndef WITH_WATCHDOG

#define WITH_WATCHDOG

#endif



#endif /* _LINUX_LIBCFS_H */

drivers/staging/lustre/lnet/libcfs/tracefile.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata, 
		goto console;

	}



	depth = __current_nesting_level();

	depth = 0;

	known_size = strlen(file) + 1 + depth;

	if (msgdata->msg_fn)

		known_size += strlen(msgdata->msg_fn) + 1;