Merge commit 'ocfs2/linux-next'

4 files changed, 59 insertions, 51 deletions

diff --git a/fs/ocfs2/cluster/netdebug.c b/fs/ocfs2/cluster/netdebug.c
index 7bf3c0ea7bd9..45d7d107fc36 100644
--- a/fs/ocfs2/cluster/netdebug.c
+++ b/fs/ocfs2/cluster/netdebug.c
@@ -24,8 +24,6 @@
  *
  */
 
-#ifdef CONFIG_DEBUG_FS
-
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/slab.h>
@@ -43,6 +41,8 @@
 
 #include "tcp_internal.h"
 
+#ifdef CONFIG_DEBUG_FS
+
 #define O2NET_DEBUG_DIR		"o2net"
 #define SC_DEBUG_NAME		"sock_containers"
 #define NST_DEBUG_NAME		"send_tracking"
@@ -438,4 +438,31 @@ void o2net_debugfs_exit(void)
 		debugfs_remove(o2net_dentry);
 }
 
+#else
+
+int o2net_debugfs_init(void)
+{
+	return 0;
+}
+
+void o2net_debugfs_exit(void)
+{
+}
+
+void o2net_debug_add_nst(struct o2net_send_tracking *nst)
+{
+}
+
+void o2net_debug_del_nst(struct o2net_send_tracking *nst)
+{
+}
+
+void o2net_debug_add_sc(struct o2net_sock_container *sc)
+{
+}
+
+void o2net_debug_del_sc(struct o2net_sock_container *sc)
+{
+}
+
 #endif	/* CONFIG_DEBUG_FS */
diff --git a/fs/ocfs2/cluster/tcp.h b/fs/ocfs2/cluster/tcp.h
index a705d5d19036..f94dbdc0ea7e 100644
--- a/fs/ocfs2/cluster/tcp.h
+++ b/fs/ocfs2/cluster/tcp.h
@@ -120,33 +120,11 @@ void o2net_exit(void);
 struct o2net_send_tracking;
 struct o2net_sock_container;
 
-#ifdef CONFIG_DEBUG_FS
 int o2net_debugfs_init(void);
 void o2net_debugfs_exit(void);
 void o2net_debug_add_nst(struct o2net_send_tracking *nst);
 void o2net_debug_del_nst(struct o2net_send_tracking *nst);
 void o2net_debug_add_sc(struct o2net_sock_container *sc);
 void o2net_debug_del_sc(struct o2net_sock_container *sc);
-#else
-static int o2net_debugfs_init(void)
-{
-	return 0;
-}
-static void o2net_debugfs_exit(void)
-{
-}
-static void o2net_debug_add_nst(struct o2net_send_tracking *nst)
-{
-}
-static void o2net_debug_del_nst(struct o2net_send_tracking *nst)
-{
-}
-static void o2net_debug_add_sc(struct o2net_sock_container *sc)
-{
-}
-static void o2net_debug_del_sc(struct o2net_sock_container *sc)
-{
-}
-#endif	/* CONFIG_DEBUG_FS */
 
 #endif /* O2CLUSTER_TCP_H */
diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index 1b81dcba175d..f4ea228668e8 100644
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -1034,4 +1034,34 @@ void dlm_destroy_debugfs_root(void)
 	if (dlm_debugfs_root)
 		debugfs_remove(dlm_debugfs_root);
 }
+
+#else
+
+int dlm_debug_init(struct dlm_ctxt *dlm)
+{
+	return 0;
+}
+
+void dlm_debug_shutdown(struct dlm_ctxt *dlm)
+{
+}
+
+int dlm_create_debugfs_subroot(struct dlm_ctxt *dlm)
+{
+	return 0;
+}
+
+void dlm_destroy_debugfs_subroot(struct dlm_ctxt *dlm)
+{
+}
+
+int dlm_create_debugfs_root(void)
+{
+	return 0;
+}
+
+void dlm_destroy_debugfs_root(void)
+{
+}
+
 #endif	/* CONFIG_DEBUG_FS */
diff --git a/fs/ocfs2/dlm/dlmdebug.h b/fs/ocfs2/dlm/dlmdebug.h
index d34a62a3a625..a92f2097c2f8 100644
--- a/fs/ocfs2/dlm/dlmdebug.h
+++ b/fs/ocfs2/dlm/dlmdebug.h
@@ -27,8 +27,6 @@
 
 void dlm_print_one_mle(struct dlm_master_list_entry *mle);
 
-#ifdef CONFIG_DEBUG_FS
-
 struct dlm_debug_ctxt {
 	struct kref debug_refcnt;
 	struct dentry *debug_state_dentry;
@@ -58,29 +56,4 @@ void dlm_destroy_debugfs_subroot(struct dlm_ctxt *dlm);
 int dlm_create_debugfs_root(void);
 void dlm_destroy_debugfs_root(void);
 
-#else
-
-static int dlm_debug_init(struct dlm_ctxt *dlm)
-{
-	return 0;
-}
-static void dlm_debug_shutdown(struct dlm_ctxt *dlm)
-{
-}
-static int dlm_create_debugfs_subroot(struct dlm_ctxt *dlm)
-{
-	return 0;
-}
-static void dlm_destroy_debugfs_subroot(struct dlm_ctxt *dlm)
-{
-}
-static int dlm_create_debugfs_root(void)
-{
-	return 0;
-}
-static void dlm_destroy_debugfs_root(void)
-{
-}
-
-#endif	/* CONFIG_DEBUG_FS */
 #endif	/* DLMDEBUG_H */