9p: remove CONFIG_NET_9P_DEBUG option

Remove the CONFIG_NET_9P_DEBUG option, used to completely remove logging
functionality from v9fs.  Logging is (already) controlled with the
run-time debug= option, this gets rid of the compile-time option (which
was being misunderstood and misused).

Signed-off-by: Alex Ray <ajray@ncsu.edu>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index ef96618861129ea023f6d9b4e0b77c65b452b997..f1cb2e26aaff929cce1fdee45e8a18dad9595323 100644 (file)
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -148,9 +148,7 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
                switch (token) {
                case Opt_debug:
                        v9ses->debug = option;
-#ifdef CONFIG_NET_9P_DEBUG
                        p9_debug_level = option;
-#endif
                        break;
 
                case Opt_dfltuid:

diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h
index 342dcf13d039a8470ddcf4628b55c510c7fb13fe..17cc4378b61bf69625a084caf9c6e28ad45131b4 100644 (file)
--- a/include/net/9p/9p.h
+++ b/include/net/9p/9p.h
@@ -61,7 +61,6 @@ enum p9_debug_flags {
        P9_DEBUG_VPKT =         (1<<12),
 };
 
-#ifdef CONFIG_NET_9P_DEBUG
 extern unsigned int p9_debug_level;
 
 #define P9_DPRINTK(level, format, arg...) \
@@ -78,11 +77,6 @@ do {  \
 
 #define P9_DUMP_PKT(way, pdu) p9pdu_dump(way, pdu)
 
-#else
-#define P9_DPRINTK(level, format, arg...)  do { } while (0)
-#define P9_DUMP_PKT(way, pdu) do { } while (0)
-#endif
-
 
 #define P9_EPRINTK(level, format, arg...) \
 do { \

diff --git a/net/9p/Kconfig b/net/9p/Kconfig
index d9ea09b11cf8140529b0649b34a5252a551e81b5..e1335e5e2f62e0a43fc72f1bf264125a533f5e83 100644 (file)
--- a/net/9p/Kconfig
+++ b/net/9p/Kconfig
@@ -28,9 +28,4 @@ config NET_9P_RDMA
        help
          This builds support for an RDMA transport.
 
-config NET_9P_DEBUG
-       bool "Debug information"
-       help
-         Say Y if you want the 9P subsystem to log debug information.
-
 endif

diff --git a/net/9p/mod.c b/net/9p/mod.c
index 2664d1292291344e6a43964334df681d4e49e372..4a3a3036c988b5f1cecf35768458c3aed88766dc 100644 (file)
--- a/net/9p/mod.c
+++ b/net/9p/mod.c
@@ -34,12 +34,10 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 
-#ifdef CONFIG_NET_9P_DEBUG
 unsigned int p9_debug_level = 0;       /* feature-rific global debug level  */
 EXPORT_SYMBOL(p9_debug_level);
 module_param_named(debug, p9_debug_level, uint, 0);
 MODULE_PARM_DESC(debug, "9P debugging level");
-#endif
 
 /*
  * Dynamic Transport Registration Routines

diff --git a/net/9p/protocol.c b/net/9p/protocol.c
index df58375ea6b33890030c649938403cf73c2f30f6..04b0585619d79401dcaf2424549543359b82a4a9 100644 (file)
--- a/net/9p/protocol.c
+++ b/net/9p/protocol.c
@@ -40,7 +40,6 @@
 static int
 p9pdu_writef(struct p9_fcall *pdu, int proto_version, const char *fmt, ...);
 
-#ifdef CONFIG_NET_9P_DEBUG
 void
 p9pdu_dump(int way, struct p9_fcall *pdu)
 {
@@ -63,12 +62,6 @@ p9pdu_dump(int way, struct p9_fcall *pdu)
                print_hex_dump_bytes("]9P[ ", DUMP_PREFIX_OFFSET, pdu->sdata,
                                                                        len);
 }
-#else
-void
-p9pdu_dump(int way, struct p9_fcall *pdu)
-{
-}
-#endif
 EXPORT_SYMBOL(p9pdu_dump);
 
 void p9stat_free(struct p9_wstat *stbuf)