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 <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>

diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
index 67d531ad5a562bf6d3ab830f08b5869bc36921f0..6e35f2f3c897b5da12ae115ef7642de3e0030b57 100644 (file)
--- 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 e0bf5e4dce0da164ed046fc7aa3915ecef58a1e3..dc6e3e6269c3854ff0af54d7c2252ca458ff1fff 100644 (file)
--- 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 */
-
-/* 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__)

diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c
index 36f1390b5ed7d6d324471ca145c529cda5477555..a4f4b508eff288d9ea2ea089b5917ae9aac2848e 100644 (file)
--- a/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@ -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;