AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-19 06:46:49 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: lustre: use __func__ instead of __FUNCTION__

Browse Source 
__FUNCTION__ is gcc specific; use __func__ instead.

Signed-off-by: Christoph Jaeger <email@christophjaeger.info>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christoph Jaeger 2014-03-28 00:21:07 +01:00 committed by Greg Kroah-Hartman
parent f5e8269b5a
commit f9bd9c1a08
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
View File

@ -183,7 +183,7 @@ struct libcfs_debug_msg_data {
do { \ do { \
(data)->msg_subsys = DEBUG_SUBSYSTEM; \ (data)->msg_subsys = DEBUG_SUBSYSTEM; \
(data)->msg_file = __FILE__; \ (data)->msg_file = __FILE__; \
(data)->msg_fn = __FUNCTION__; \ (data)->msg_fn = __func__; \
(data)->msg_line = __LINE__; \ (data)->msg_line = __LINE__; \
(data)->msg_cdls = (cdls); \ (data)->msg_cdls = (cdls); \
(data)->msg_mask = (mask); \ (data)->msg_mask = (mask); \
@ -193,7 +193,7 @@ do { \
static struct libcfs_debug_msg_data dataname = { \ static struct libcfs_debug_msg_data dataname = { \
.msg_subsys = DEBUG_SUBSYSTEM, \ .msg_subsys = DEBUG_SUBSYSTEM, \
.msg_file = __FILE__, \ .msg_file = __FILE__, \
.msg_fn = __FUNCTION__, \ .msg_fn = __func__, \
.msg_line = __LINE__, \ .msg_line = __LINE__, \
.msg_cdls = (cdls) }; \ .msg_cdls = (cdls) }; \
dataname.msg_mask = (mask); dataname.msg_mask = (mask);

2
drivers/staging/lustre/lustre/include/linux/obd.h
View File

@ -104,7 +104,7 @@ static inline void __client_obd_list_lock(client_obd_lock_t *lock,
} }
#define client_obd_list_lock(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) static inline void client_obd_list_unlock(client_obd_lock_t *lock)
{ {

4
drivers/staging/lustre/lustre/include/lu_ref.h
View File

@ -69,12 +69,12 @@
* *
* // current thread acquired a temporary reference to foo. * // current thread acquired a temporary reference to foo.
* foo_get(foo); * foo_get(foo);
* lu_ref_add(&foo->reference, __FUNCTION__, current); * lu_ref_add(&foo->reference, __func__, current);
* *
* ... * ...
* *
* // temporary reference is released. * // temporary reference is released.
* lu_ref_del(&foo->reference, __FUNCTION__, current); * lu_ref_del(&foo->reference, __func__, current);
* foo_put(foo); * foo_put(foo);
* \endcode * \endcode
* *

4
drivers/staging/lustre/lustre/include/lustre_dlm.h
View File

@ -1312,11 +1312,11 @@ int ldlm_lock_change_resource(struct ldlm_namespace *, struct ldlm_lock *,
const struct ldlm_res_id *); const struct ldlm_res_id *);
#define LDLM_RESOURCE_ADDREF(res) do { \ #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) } while (0)
#define LDLM_RESOURCE_DELREF(res) do { \ #define LDLM_RESOURCE_DELREF(res) do { \
lu_ref_del(&(res)->lr_reference, __FUNCTION__, current); \ lu_ref_del(&(res)->lr_reference, __func__, current); \
} while (0) } while (0)
/* ldlm_request.c */ /* ldlm_request.c */

2
drivers/staging/lustre/lustre/obdclass/cl_lock.c
View File

@ -139,7 +139,7 @@ static void cl_lock_trace0(int level, const struct lu_env *env,
func, line); func, line);
} }
#define cl_lock_trace(level, env, prefix, lock) \ #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)) #define RETIP ((unsigned long)__builtin_return_address(0))

4
drivers/staging/lustre/lustre/obdclass/genops.c
View File

@ -615,13 +615,13 @@ int class_notify_sptlrpc_conf(const char *fsname, int namelen)
if (strncmp(obd->obd_name, fsname, namelen)) if (strncmp(obd->obd_name, fsname, namelen))
continue; continue;
class_incref(obd, __FUNCTION__, obd); class_incref(obd, __func__, obd);
read_unlock(&obd_dev_lock); read_unlock(&obd_dev_lock);
rc2 = obd_set_info_async(NULL, obd->obd_self_export, rc2 = obd_set_info_async(NULL, obd->obd_self_export,
sizeof(KEY_SPTLRPC_CONF), sizeof(KEY_SPTLRPC_CONF),
KEY_SPTLRPC_CONF, 0, NULL, NULL); KEY_SPTLRPC_CONF, 0, NULL, NULL);
rc = rc ? rc : rc2; rc = rc ? rc : rc2;
class_decref(obd, __FUNCTION__, obd); class_decref(obd, __func__, obd);
read_lock(&obd_dev_lock); read_lock(&obd_dev_lock);
} }
read_unlock(&obd_dev_lock); read_unlock(&obd_dev_lock);

4
drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
View File

@ -244,7 +244,7 @@ static int obd_proc_health_seq_show(struct seq_file *m, void *v)
if (obd->obd_stopping) if (obd->obd_stopping)
continue; continue;
class_incref(obd, __FUNCTION__, current); class_incref(obd, __func__, current);
read_unlock(&obd_dev_lock); read_unlock(&obd_dev_lock);
if (obd_health_check(NULL, obd)) { if (obd_health_check(NULL, obd)) {
@ -252,7 +252,7 @@ static int obd_proc_health_seq_show(struct seq_file *m, void *v)
obd->obd_name); obd->obd_name);
rc++; rc++;
} }
class_decref(obd, __FUNCTION__, current); class_decref(obd, __func__, current);
read_lock(&obd_dev_lock); read_lock(&obd_dev_lock);
} }
read_unlock(&obd_dev_lock); read_unlock(&obd_dev_lock);

4
drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
View File

@ -1190,7 +1190,7 @@ int lprocfs_wr_evict_client(struct file *file, const char *buffer,
* the proc entries under the being destroyed export{}, so I have * the proc entries under the being destroyed export{}, so I have
* to drop the lock at first here. * to drop the lock at first here.
* - jay, jxiong@clusterfs.com */ * - jay, jxiong@clusterfs.com */
class_incref(obd, __FUNCTION__, current); class_incref(obd, __func__, current);
if (strncmp(tmpbuf, "nid:", 4) == 0) if (strncmp(tmpbuf, "nid:", 4) == 0)
obd_export_evict_by_nid(obd, tmpbuf + 4); obd_export_evict_by_nid(obd, tmpbuf + 4);
@ -1199,7 +1199,7 @@ int lprocfs_wr_evict_client(struct file *file, const char *buffer,
else else
obd_export_evict_by_uuid(obd, tmpbuf); obd_export_evict_by_uuid(obd, tmpbuf);
class_decref(obd, __FUNCTION__, current); class_decref(obd, __func__, current);
out: out:
OBD_FREE(kbuf, BUFLEN); OBD_FREE(kbuf, BUFLEN);