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

Commit 22395a3e authored by Ilya Dryomov's avatar Ilya Dryomov Committed by Greg Kroah-Hartman
Browse files

libceph: use kbasename() and kill ceph_file_part() 



commit 6f4dbd149d2a151b89d1a5bbf7530ee5546c7908 upstream.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Reviewed-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 180019b0

include/linux/ceph/ceph_debug.h

+3 −3
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/string.h>



#ifdef CONFIG_CEPH_LIB_PRETTYDEBUG



/*
@@ -12,12 +14,10 @@ 
 */



# if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)

extern const char *ceph_file_part(const char *s, int len);

#  define dout(fmt, ...)						\

	pr_debug("%.*s %12.12s:%-4d : " fmt,				\

		 8 - (int)sizeof(KBUILD_MODNAME), "    ",		\

		 ceph_file_part(__FILE__, sizeof(__FILE__)),		\

		 __LINE__, ##__VA_ARGS__)

		 kbasename(__FILE__), __LINE__, ##__VA_ARGS__)

# else

/* faux printk call just to see any compiler warnings. */

#  define dout(fmt, ...)	do {				\

net/ceph/ceph_common.c

+0 −13
Original line number Diff line number Diff line
@@ -45,19 +45,6 @@ bool libceph_compatible(void *data) 
}

EXPORT_SYMBOL(libceph_compatible);



/*

 * 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)

{

	switch (type) {