diff mbox

[01/31] batman-adv: debugfs, avoid compiling for !DEBUG_FS

Message ID 1417519009-20699-2-git-send-email-mpa@pengutronix.de (mailing list archive)
State Accepted, archived
Commit fe67bb41f0e1647c3b05aeb4b736a1171bff496b
Headers

Commit Message

Markus Pargmann Dec. 2, 2014, 11:16 a.m. UTC 
  Normally the debugfs framework will return error pointer with -ENODEV
for function calls when DEBUG_FS is not set.

batman does not notice this error code and continues trying to create
debugfs files and executes more code. We can avoid this code execution
by disabling compiling debugfs.c when DEBUG_FS is not set.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 Makefile.kbuild |  2 +-
 debugfs.c       |  8 --------
 debugfs.h       | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 9 deletions(-)
diff mbox

Patch

diff --git a/Makefile.kbuild b/Makefile.kbuild
index eb7d8c0388e4..96fa99b3a409 100644
--- a/Makefile.kbuild
+++ b/Makefile.kbuild
@@ -20,7 +20,7 @@  obj-$(CONFIG_BATMAN_ADV) += batman-adv.o
 batman-adv-y += bat_iv_ogm.o
 batman-adv-y += bitarray.o
 batman-adv-$(CONFIG_BATMAN_ADV_BLA) += bridge_loop_avoidance.o
-batman-adv-y += debugfs.o
+batman-adv-$(CONFIG_DEBUG_FS) += debugfs.o
 batman-adv-$(CONFIG_BATMAN_ADV_DAT) += distributed-arp-table.o
 batman-adv-y += fragmentation.o
 batman-adv-y += gateway_client.o
diff --git a/debugfs.c b/debugfs.c
index d9b9a8eb17fb..026a25ce364c 100644
--- a/debugfs.c
+++ b/debugfs.c
@@ -483,11 +483,7 @@  rem_attr:
 	debugfs_remove_recursive(hard_iface->debug_dir);
 	hard_iface->debug_dir = NULL;
 out:
-#ifdef CONFIG_DEBUG_FS
 	return -ENOMEM;
-#else
-	return 0;
-#endif /* CONFIG_DEBUG_FS */
 }
 
 /**
@@ -542,11 +538,7 @@  rem_attr:
 	debugfs_remove_recursive(bat_priv->debug_dir);
 	bat_priv->debug_dir = NULL;
 out:
-#ifdef CONFIG_DEBUG_FS
 	return -ENOMEM;
-#else
-	return 0;
-#endif /* CONFIG_DEBUG_FS */
 }
 
 void batadv_debugfs_del_meshif(struct net_device *dev)
diff --git a/debugfs.h b/debugfs.h
index 37c4d6ddd04d..5db336a6ef57 100644
--- a/debugfs.h
+++ b/debugfs.h
@@ -20,6 +20,8 @@ 
 
 #define BATADV_DEBUGFS_SUBDIR "batman_adv"
 
+#if IS_ENABLED(CONFIG_DEBUG_FS)
+
 void batadv_debugfs_init(void);
 void batadv_debugfs_destroy(void);
 int batadv_debugfs_add_meshif(struct net_device *dev);
@@ -27,4 +29,36 @@  void batadv_debugfs_del_meshif(struct net_device *dev);
 int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface);
 void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface);
 
+#else
+
+static inline void batadv_debugfs_init(void)
+{
+}
+
+static inline void batadv_debugfs_destroy(void)
+{
+}
+
+static inline int batadv_debugfs_add_meshif(struct net_device *dev)
+{
+	return 0;
+}
+
+static inline void batadv_debugfs_del_meshif(struct net_device *dev)
+{
+}
+
+static inline int batadv_debugfs_add_hardif(
+		struct batadv_hard_iface *hard_iface)
+{
+	return 0;
+}
+
+static inline void batadv_debugfs_del_hardif(
+		struct batadv_hard_iface *hard_iface)
+{
+}
+
+#endif
+
 #endif /* _NET_BATMAN_ADV_DEBUGFS_H_ */