Merge tag 'for-linus-3.11-merge-window-part-1' of git://git.kernel.org/pub/scm/linux...

Pull 9p update from Eric Van Hensbergen:
 "Grab bag of little fixes and enhancements:
  - optional security enhancements
  - fix path coverage in MAINTAINERS
  - switch to using most used protocol and transport as default
  - clean up buffer dumps in trace code

  Held off on RDMA patches as they need to be cleaned up a bit, but will
  try to get the cleaned, checked, and pushed by mid-week"

* tag 'for-linus-3.11-merge-window-part-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: Add rest of 9p files to MAINTAINERS entry
  9p: trace: use %*ph to dump buffer
  net/9p: Handle error in zero copy request correctly for 9p2000.u
  net/9p: Use virtio transpart as the default transport
  net/9p: Make 9P2000.L the default protocol for 9p file system

diff --git a/MAINTAINERS b/MAINTAINERS
index 97762ad253002f86b5ab0a04af22d8fc7f19e900..e03c40eb39e053abe114fd822209ed4642a5636e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -180,6 +180,11 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
 S:     Maintained
 F:     Documentation/filesystems/9p.txt
 F:     fs/9p/
+F:     net/9p/
+F:     include/net/9p/
+F:     include/uapi/linux/virtio_9p.h
+F:     include/trace/events/9p.h
+
 
 A8293 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>

diff --git a/include/trace/events/9p.h b/include/trace/events/9p.h
index beeaed8398eca09745746e75171b05c54345ac44..a0666362c111ae1b597ebda14973826f29f33e75 100644 (file)
--- a/include/trace/events/9p.h
+++ b/include/trace/events/9p.h
@@ -143,31 +143,9 @@ TRACE_EVENT(9p_protocol_dump,
                    __entry->tag    =  pdu->tag;
                    memcpy(__entry->line, pdu->sdata, P9_PROTO_DUMP_SZ);
                    ),
-           TP_printk("clnt %lu %s(tag = %d)\n%.3x: "
-                     "%02x %02x %02x %02x %02x %02x %02x %02x "
-                     "%02x %02x %02x %02x %02x %02x %02x %02x\n"
-                     "%.3x: "
-                     "%02x %02x %02x %02x %02x %02x %02x %02x "
-                     "%02x %02x %02x %02x %02x %02x %02x %02x\n",
-                     (long)__entry->clnt, show_9p_op(__entry->type),
-                     __entry->tag, 0,
-                     __entry->line[0],  __entry->line[1],
-                     __entry->line[2],  __entry->line[3],
-                     __entry->line[4],  __entry->line[5],
-                     __entry->line[6],  __entry->line[7],
-                     __entry->line[8],  __entry->line[9],
-                     __entry->line[10], __entry->line[11],
-                     __entry->line[12], __entry->line[13],
-                     __entry->line[14], __entry->line[15],
-                     16,
-                     __entry->line[16], __entry->line[17],
-                     __entry->line[18], __entry->line[19],
-                     __entry->line[20], __entry->line[21],
-                     __entry->line[22], __entry->line[23],
-                     __entry->line[24], __entry->line[25],
-                     __entry->line[26], __entry->line[27],
-                     __entry->line[28], __entry->line[29],
-                     __entry->line[30], __entry->line[31])
+           TP_printk("clnt %lu %s(tag = %d)\n%.3x: %16ph\n%.3x: %16ph\n",
+                     (unsigned long)__entry->clnt, show_9p_op(__entry->type),
+                     __entry->tag, 0, __entry->line, 16, __entry->line + 16)
  );
 
 #endif /* _TRACE_9P_H */

diff --git a/net/9p/client.c b/net/9p/client.c
index addc116cecf0be16210498b6544fa40ad24cc615..01f1779eba805c0e32192280cbd73be6500aab08 100644 (file)
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -127,7 +127,7 @@ static int parse_opts(char *opts, struct p9_client *clnt)
        char *s;
        int ret = 0;
 
-       clnt->proto_version = p9_proto_2000u;
+       clnt->proto_version = p9_proto_2000L;
        clnt->msize = 8192;
 
        if (!opts)
@@ -995,6 +995,9 @@ struct p9_client *p9_client_create(const char *dev_name, char *options)
        if (err < 0)
                goto destroy_tagpool;
 
+       if (!clnt->trans_mod)
+               clnt->trans_mod = v9fs_get_trans_by_name("virtio");
+
        if (!clnt->trans_mod)
                clnt->trans_mod = v9fs_get_default_trans();