orangefs: remove gossip_ldebug and gossip_lerr

Web:        https://git.kernel.org/torvalds/c/79d7cd611d9e0ee9b4c38bd33f6082979826885f
Commit:     79d7cd611d9e0ee9b4c38bd33f6082979826885f
Parent:     7a3bc1f019e3ba25c7056e651fb463f05e395e9d
Refname:    refs/heads/master
Author:     Martin Brandenburg <[email protected]>
AuthorDate: Fri Jan 26 14:07:12 2018 -0500
Committer:  Mike Marshall <[email protected]>
CommitDate: Tue Feb 6 16:38:12 2018 -0500

    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: Martin Brandenburg <[email protected]>
    Signed-off-by: Mike Marshall <[email protected]>
---
 fs/orangefs/orangefs-debugfs.c |  2 +-
 fs/orangefs/protocol.h         | 15 ---------------
 fs/orangefs/super.c            |  2 +-
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
index 67d531ad5a56..6e35f2f3c897 100644
--- a/fs/orangefs/orangefs-debugfs.c
+++ b/fs/orangefs/orangefs-debugfs.c
@@ -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;
 	}
 
diff --git a/fs/orangefs/protocol.h b/fs/orangefs/protocol.h
index e0bf5e4dce0d..dc6e3e6269c3 100644
--- a/fs/orangefs/protocol.h
+++ b/fs/orangefs/protocol.h
@@ -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 */