mirror of
https://github.com/torvalds/linux.git
synced 2024-09-20 15:03:04 +00:00
libceph: add doutc and *_client debug macros support
This will help print the fsid and client's global_id in debug logs, and also print the function names. [ idryomov: %lld -> %llu, leading space for doutc(), don't include __func__ in pr_*() variants ] Link: https://tracker.ceph.com/issues/61590 Signed-off-by: Xiubo Li <xiubli@redhat.com> Reviewed-by: Patrick Donnelly <pdonnell@redhat.com> Reviewed-by: Milind Changire <mchangir@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
parent
ffc253263a
commit
5c5f0d2b5f
|
@ -19,12 +19,25 @@
|
|||
pr_debug("%.*s %12.12s:%-4d : " fmt, \
|
||||
8 - (int)sizeof(KBUILD_MODNAME), " ", \
|
||||
kbasename(__FILE__), __LINE__, ##__VA_ARGS__)
|
||||
# define doutc(client, fmt, ...) \
|
||||
pr_debug("%.*s %12.12s:%-4d : [%pU %llu] " fmt, \
|
||||
8 - (int)sizeof(KBUILD_MODNAME), " ", \
|
||||
kbasename(__FILE__), __LINE__, \
|
||||
&client->fsid, client->monc.auth->global_id, \
|
||||
##__VA_ARGS__)
|
||||
# else
|
||||
/* faux printk call just to see any compiler warnings. */
|
||||
# define dout(fmt, ...) do { \
|
||||
if (0) \
|
||||
printk(KERN_DEBUG fmt, ##__VA_ARGS__); \
|
||||
} while (0)
|
||||
# define doutc(client, fmt, ...) do { \
|
||||
if (0) \
|
||||
printk(KERN_DEBUG "[%pU %llu] " fmt, \
|
||||
&client->fsid, \
|
||||
client->monc.auth->global_id, \
|
||||
##__VA_ARGS__); \
|
||||
} while (0)
|
||||
# endif
|
||||
|
||||
#else
|
||||
|
@ -33,7 +46,32 @@
|
|||
* or, just wrap pr_debug
|
||||
*/
|
||||
# define dout(fmt, ...) pr_debug(" " fmt, ##__VA_ARGS__)
|
||||
# define doutc(client, fmt, ...) \
|
||||
pr_debug(" [%pU %llu] %s: " fmt, &client->fsid, \
|
||||
client->monc.auth->global_id, __func__, ##__VA_ARGS__)
|
||||
|
||||
#endif
|
||||
|
||||
#define pr_notice_client(client, fmt, ...) \
|
||||
pr_notice("[%pU %llu]: " fmt, &client->fsid, \
|
||||
client->monc.auth->global_id, ##__VA_ARGS__)
|
||||
#define pr_info_client(client, fmt, ...) \
|
||||
pr_info("[%pU %llu]: " fmt, &client->fsid, \
|
||||
client->monc.auth->global_id, ##__VA_ARGS__)
|
||||
#define pr_warn_client(client, fmt, ...) \
|
||||
pr_warn("[%pU %llu]: " fmt, &client->fsid, \
|
||||
client->monc.auth->global_id, ##__VA_ARGS__)
|
||||
#define pr_warn_once_client(client, fmt, ...) \
|
||||
pr_warn_once("[%pU %llu]: " fmt, &client->fsid, \
|
||||
client->monc.auth->global_id, ##__VA_ARGS__)
|
||||
#define pr_err_client(client, fmt, ...) \
|
||||
pr_err("[%pU %llu]: " fmt, &client->fsid, \
|
||||
client->monc.auth->global_id, ##__VA_ARGS__)
|
||||
#define pr_warn_ratelimited_client(client, fmt, ...) \
|
||||
pr_warn_ratelimited("[%pU %llu]: " fmt, &client->fsid, \
|
||||
client->monc.auth->global_id, ##__VA_ARGS__)
|
||||
#define pr_err_ratelimited_client(client, fmt, ...) \
|
||||
pr_err_ratelimited("[%pU %llu]: " fmt, &client->fsid, \
|
||||
client->monc.auth->global_id, ##__VA_ARGS__)
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue
Block a user