batman-adv: debugfs, avoid compiling for !DEBUG_FS

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>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>

diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile
index 79833ebcc2ddaf2671221b53b4a0621517308ea6..bd7e343c98d192d99e770370b15c8bd88ce2b869 100644 (file)
--- a/net/batman-adv/Makefile
+++ b/net/batman-adv/Makefile
@@ -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/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c
index 0c213a89229617c9fbcc469183b605125cf57d37..46118084221a1c05f2d98ddf10f5bc9bb905305c 100644 (file)
--- a/net/batman-adv/debugfs.c
+++ b/net/batman-adv/debugfs.c
@@ -482,11 +482,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 */
 }
 
 /**
@@ -541,11 +537,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 --cc net/batman-adv/debugfs.h
Simple merge