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

Commit 79d7cd61 authored by Martin Brandenburg's avatar Martin Brandenburg Committed by Mike Marshall
Browse files

orangefs: remove gossip_ldebug and gossip_lerr 



gossip_ldebug is unused.

gossip_lerr is used in two places.  The messages are unique so line
numbers are unnecessary.

Also remove support for compiling gossip messages out.  It wasn't
possible to enable it anyway.

Signed-off-by: default avatarMartin Brandenburg <martin@omnibond.com>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent 7a3bc1f0

fs/orangefs/orangefs-debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1056,7 +1056,7 @@ int orangefs_debugfs_new_debug(void __user *arg) 
			client_debug_string,

			llu(mask_info.mask_value));

	} else {

		gossip_lerr("Invalid mask type....\n");

		gossip_err("Invalid mask type....\n");

		return -EINVAL;

	}

fs/orangefs/protocol.h

+0 −15
Original line number Diff line number Diff line
@@ -395,13 +395,6 @@ struct ORANGEFS_dev_map_desc { 


/* gossip.h *****************************************************************/



#ifdef GOSSIP_DISABLE_DEBUG

#define gossip_debug(mask, fmt, ...)					\

do {									\

	if (0)								\

		printk(KERN_DEBUG fmt, ##__VA_ARGS__);			\

} while (0)

#else

extern __u64 orangefs_gossip_debug_mask;



/* try to avoid function call overhead by checking masks in macro */
@@ -410,13 +403,5 @@ do { \ 
	if (orangefs_gossip_debug_mask & (mask))			\

		printk(KERN_DEBUG fmt, ##__VA_ARGS__);			\

} while (0)

#endif /* GOSSIP_DISABLE_DEBUG */



/* do file and line number printouts w/ the GNU preprocessor */

#define gossip_ldebug(mask, fmt, ...)					\

	gossip_debug(mask, "%s: " fmt, __func__, ##__VA_ARGS__)



#define gossip_err pr_err
 
#define gossip_lerr(fmt, ...)						\

	gossip_err("%s line %d: " fmt,					\

		   __FILE__, __LINE__, ##__VA_ARGS__)

fs/orangefs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ static int orangefs_encode_fh(struct inode *inode, 
	struct orangefs_object_kref refn;



	if (*max_len < len) {

		gossip_lerr("fh buffer is too small for encoding\n");

		gossip_err("fh buffer is too small for encoding\n");

		*max_len = len;

		type = 255;

		goto out;