diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2017-05-19 05:33:16 -0400 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2017-05-23 14:32:10 -0400 |
| commit | 6f4dbd149d2a151b89d1a5bbf7530ee5546c7908 (patch) | |
| tree | 80d2eb0bd882f7cd9d72f8a6f847c156682ddcd4 /include/linux/ceph | |
| parent | 08332893e37af6ae779367e78e444f8f9571511d (diff) | |
libceph: use kbasename() and kill ceph_file_part()
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'include/linux/ceph')
| -rw-r--r-- | include/linux/ceph/ceph_debug.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/ceph/ceph_debug.h b/include/linux/ceph/ceph_debug.h index aa2e19182d99..51c5bd64bd00 100644 --- a/include/linux/ceph/ceph_debug.h +++ b/include/linux/ceph/ceph_debug.h | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | 3 | ||
| 4 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | 4 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 5 | 5 | ||
| 6 | #include <linux/string.h> | ||
| 7 | |||
| 6 | #ifdef CONFIG_CEPH_LIB_PRETTYDEBUG | 8 | #ifdef CONFIG_CEPH_LIB_PRETTYDEBUG |
| 7 | 9 | ||
| 8 | /* | 10 | /* |
| @@ -12,12 +14,10 @@ | |||
| 12 | */ | 14 | */ |
| 13 | 15 | ||
| 14 | # if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG) | 16 | # if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG) |
| 15 | extern const char *ceph_file_part(const char *s, int len); | ||
| 16 | # define dout(fmt, ...) \ | 17 | # define dout(fmt, ...) \ |
| 17 | pr_debug("%.*s %12.12s:%-4d : " fmt, \ | 18 | pr_debug("%.*s %12.12s:%-4d : " fmt, \ |
| 18 | 8 - (int)sizeof(KBUILD_MODNAME), " ", \ | 19 | 8 - (int)sizeof(KBUILD_MODNAME), " ", \ |
| 19 | ceph_file_part(__FILE__, sizeof(__FILE__)), \ | 20 | kbasename(__FILE__), __LINE__, ##__VA_ARGS__) |
| 20 | __LINE__, ##__VA_ARGS__) | ||
| 21 | # else | 21 | # else |
| 22 | /* faux printk call just to see any compiler warnings. */ | 22 | /* faux printk call just to see any compiler warnings. */ |
| 23 | # define dout(fmt, ...) do { \ | 23 | # define dout(fmt, ...) do { \ |
