iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

orangefs: remove gossip_ldebug and gossip_lerr

Browse Source 
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: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
This commit is contained in:
Martin Brandenburg 2018-01-26 14:07:12 -05:00 committed by Mike Marshall
parent 7a3bc1f019
commit 79d7cd611d
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/orangefs/orangefs-debugfs.c
View File

@ -1056,7 +1056,7 @@ int orangefs_debugfs_new_debug(void __user *arg)
client_debug_string, client_debug_string,
llu(mask_info.mask_value)); llu(mask_info.mask_value));
} else { } else {
gossip_lerr("Invalid mask type....\n"); gossip_err("Invalid mask type....\n");
return -EINVAL; return -EINVAL;
} }

15
fs/orangefs/protocol.h
View File

@ -395,13 +395,6 @@ struct ORANGEFS_dev_map_desc {
/* gossip.h *****************************************************************/ /* 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; extern __u64 orangefs_gossip_debug_mask;
/* try to avoid function call overhead by checking masks in macro */ /* try to avoid function call overhead by checking masks in macro */
@ -410,13 +403,5 @@ do { \
if (orangefs_gossip_debug_mask & (mask)) \ if (orangefs_gossip_debug_mask & (mask)) \
printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ printk(KERN_DEBUG fmt, ##__VA_ARGS__); \
} while (0) } 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_err pr_err
#define gossip_lerr(fmt, ...) \
gossip_err("%s line %d: " fmt, \
__FILE__, __LINE__, ##__VA_ARGS__)

2
fs/orangefs/super.c
View File

@ -335,7 +335,7 @@ static int orangefs_encode_fh(struct inode *inode,
struct orangefs_object_kref refn; struct orangefs_object_kref refn;
if (*max_len < len) { 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; *max_len = len;
type = 255; type = 255;
goto out; goto out;