hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libceph: use kbasename() and kill ceph_file_part() 

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Alex Elder <elder@linaro.org>
This commit is contained in:
Ilya Dryomov 2017-05-19 11:33:16 +02:00
parent 08332893e3
commit 6f4dbd149d
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/ceph/ceph_debug.h
View File

@ -3,6 +3,8 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/string.h>
#ifdef CONFIG_CEPH_LIB_PRETTYDEBUG #ifdef CONFIG_CEPH_LIB_PRETTYDEBUG
/* /*
@ -12,12 +14,10 @@
*/ */
# if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG) # if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)
extern const char *ceph_file_part(const char *s, int len);
# define dout(fmt, ...) \ # define dout(fmt, ...) \
pr_debug("%.*s %12.12s:%-4d : " fmt, \ pr_debug("%.*s %12.12s:%-4d : " fmt, \
8 - (int)sizeof(KBUILD_MODNAME), " ", \ 8 - (int)sizeof(KBUILD_MODNAME), " ", \
ceph_file_part(__FILE__, sizeof(__FILE__)), \ kbasename(__FILE__), __LINE__, ##__VA_ARGS__)
__LINE__, ##__VA_ARGS__)
# else # else
/* faux printk call just to see any compiler warnings. */ /* faux printk call just to see any compiler warnings. */
# define dout(fmt, ...) do { \ # define dout(fmt, ...) do { \

13
net/ceph/ceph_common.c
View File

@ -56,19 +56,6 @@ static const struct kernel_param_ops param_ops_supported_features = {
module_param_cb(supported_features, &param_ops_supported_features, NULL, module_param_cb(supported_features, &param_ops_supported_features, NULL,
S_IRUGO); S_IRUGO);
/*
* find filename portion of a path (/foo/bar/baz -> baz)
*/
const char *ceph_file_part(const char *s, int len)
{
const char *e = s + len;
while (e != s && *(e-1) != '/')
e--;
return e;
}
EXPORT_SYMBOL(ceph_file_part);
const char *ceph_msg_type_name(int type) const char *ceph_msg_type_name(int type)
{ {
switch (type) { switch (type) {