Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9bd9c1a authored by Christoph Jaeger's avatar Christoph Jaeger Committed by Greg Kroah-Hartman
Browse files

staging: lustre: use __func__ instead of __FUNCTION__ 



__FUNCTION__ is gcc specific; use __func__ instead.

Signed-off-by: default avatarChristoph Jaeger <email@christophjaeger.info>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f5e8269b

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

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ struct libcfs_debug_msg_data { 
do {								\

	(data)->msg_subsys = DEBUG_SUBSYSTEM;			\

	(data)->msg_file   = __FILE__;				\

	(data)->msg_fn     = __FUNCTION__;			\

	(data)->msg_fn     = __func__;				\

	(data)->msg_line   = __LINE__;				\

	(data)->msg_cdls   = (cdls);				\

	(data)->msg_mask   = (mask);				\
@@ -193,7 +193,7 @@ do { \ 
	static struct libcfs_debug_msg_data dataname = {	\

	       .msg_subsys = DEBUG_SUBSYSTEM,			\

	       .msg_file   = __FILE__,				\

	       .msg_fn     = __FUNCTION__,			\

	       .msg_fn     = __func__,				\

	       .msg_line   = __LINE__,				\

	       .msg_cdls   = (cdls)	 };			\

	dataname.msg_mask   = (mask);

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

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static inline void __client_obd_list_lock(client_obd_lock_t *lock, 
}



#define client_obd_list_lock(lock) \

	__client_obd_list_lock(lock, __FUNCTION__, __LINE__)

	__client_obd_list_lock(lock, __func__, __LINE__)



static inline void client_obd_list_unlock(client_obd_lock_t *lock)

{

drivers/staging/lustre/lustre/include/lu_ref.h

+2 −2
Original line number Diff line number Diff line
@@ -69,12 +69,12 @@ 
 *

 *	// current thread acquired a temporary reference to foo.

 *	foo_get(foo);

 *	lu_ref_add(&foo->reference, __FUNCTION__, current);

 *	lu_ref_add(&foo->reference, __func__, current);

 *

 *	...

 *

 *	// temporary reference is released.

 *	lu_ref_del(&foo->reference, __FUNCTION__, current);

 *	lu_ref_del(&foo->reference, __func__, current);

 *	foo_put(foo);

 * \endcode

 *

drivers/staging/lustre/lustre/include/lustre_dlm.h

+2 −2
Original line number Diff line number Diff line
@@ -1312,11 +1312,11 @@ int ldlm_lock_change_resource(struct ldlm_namespace *, struct ldlm_lock *, 
			      const struct ldlm_res_id *);



#define LDLM_RESOURCE_ADDREF(res) do {				  \

	lu_ref_add_atomic(&(res)->lr_reference, __FUNCTION__, current);  \

	lu_ref_add_atomic(&(res)->lr_reference, __func__, current);  \

} while (0)



#define LDLM_RESOURCE_DELREF(res) do {				  \

	lu_ref_del(&(res)->lr_reference, __FUNCTION__, current);  \

	lu_ref_del(&(res)->lr_reference, __func__, current);	  \

} while (0)



/* ldlm_request.c */

drivers/staging/lustre/lustre/obdclass/cl_lock.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static void cl_lock_trace0(int level, const struct lu_env *env, 
	       func, line);

}

#define cl_lock_trace(level, env, prefix, lock)			 \

	cl_lock_trace0(level, env, prefix, lock, __FUNCTION__, __LINE__)

	cl_lock_trace0(level, env, prefix, lock, __func__, __LINE__)



#define RETIP ((unsigned long)__builtin_return_address(0))