1 files changed, 12 insertions, 41 deletions

diff --git a/net/9p/protocol.c b/net/9p/protocol.c
index b7d4e8aa5383..55e10a96c902 100644
--- a/net/9p/protocol.c
+++ b/net/9p/protocol.c
@@ -37,40 +37,11 @@
 #include <net/9p/client.h>
 #include "protocol.h"
 
+#include <trace/events/9p.h>
+
 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)
-{
-        int len = pdu->size;
-
-        if ((p9_debug_level & P9_DEBUG_VPKT) != P9_DEBUG_VPKT) {
-                if ((p9_debug_level & P9_DEBUG_PKT) == P9_DEBUG_PKT) {
-                        if (len > 32)
-                                len = 32;
-                } else {
-                        /* shouldn't happen */
-                        return;
-                }
-        }
-
-        if (way)
-                print_hex_dump_bytes("[9P] ", DUMP_PREFIX_OFFSET, pdu->sdata,
-                                                                        len);
-        else
-                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)
 {
         kfree(stbuf->name);
@@ -551,7 +522,7 @@ p9pdu_writef(struct p9_fcall *pdu, int proto_version, const char *fmt, ...)
         return ret;
 }
 
-int p9stat_read(char *buf, int len, struct p9_wstat *st, int proto_version)
+int p9stat_read(struct p9_client *clnt, char *buf, int len, struct p9_wstat *st)
 {
         struct p9_fcall fake_pdu;
         int ret;
@@ -561,10 +532,10 @@ int p9stat_read(char *buf, int len, struct p9_wstat *st, int proto_version)
         fake_pdu.sdata = buf;
         fake_pdu.offset = 0;
 
-        ret = p9pdu_readf(&fake_pdu, proto_version, "S", st);
+        ret = p9pdu_readf(&fake_pdu, clnt->proto_version, "S", st);
         if (ret) {
                 P9_DPRINTK(P9_DEBUG_9P, "<<< p9stat_read failed: %d\n", ret);
-                P9_DUMP_PKT(0, &fake_pdu);
+                trace_9p_protocol_dump(clnt, &fake_pdu);
         }
 
         return ret;
@@ -577,7 +548,7 @@ int p9pdu_prepare(struct p9_fcall *pdu, int16_t tag, int8_t type)
         return p9pdu_writef(pdu, 0, "dbw", 0, type, tag);
 }
 
-int p9pdu_finalize(struct p9_fcall *pdu)
+int p9pdu_finalize(struct p9_client *clnt, struct p9_fcall *pdu)
 {
         int size = pdu->size;
         int err;
@@ -586,7 +557,7 @@ int p9pdu_finalize(struct p9_fcall *pdu)
         err = p9pdu_writef(pdu, 0, "d", size);
         pdu->size = size;
 
-        P9_DUMP_PKT(0, pdu);
+        trace_9p_protocol_dump(clnt, pdu);
         P9_DPRINTK(P9_DEBUG_9P, ">>> size=%d type: %d tag: %d\n", pdu->size,
                                                         pdu->id, pdu->tag);
 
@@ -599,8 +570,8 @@ void p9pdu_reset(struct p9_fcall *pdu)
         pdu->size = 0;
 }
 
-int p9dirent_read(char *buf, int len, struct p9_dirent *dirent,
-                                                int proto_version)
+int p9dirent_read(struct p9_client *clnt, char *buf, int len,
+                  struct p9_dirent *dirent)
 {
         struct p9_fcall fake_pdu;
         int ret;
@@ -611,11 +582,11 @@ int p9dirent_read(char *buf, int len, struct p9_dirent *dirent,
         fake_pdu.sdata = buf;
         fake_pdu.offset = 0;
 
-        ret = p9pdu_readf(&fake_pdu, proto_version, "Qqbs", &dirent->qid,
-                        &dirent->d_off, &dirent->d_type, &nameptr);
+        ret = p9pdu_readf(&fake_pdu, clnt->proto_version, "Qqbs", &dirent->qid,
+                          &dirent->d_off, &dirent->d_type, &nameptr);
         if (ret) {
                 P9_DPRINTK(P9_DEBUG_9P, "<<< p9dirent_read failed: %d\n", ret);
-                P9_DUMP_PKT(1, &fake_pdu);
+                trace_9p_protocol_dump(clnt, &fake_pdu);
                 goto out;
         }