diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-09 21:55:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-09 21:55:13 +0200 |
| commit | 899dd388853071f5c8848545209d4e2c5d95b1d9 (patch) | |
| tree | d3ff654d58b96c3b93f29e5ae5084d94283dfeea /net/9p | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
| parent | 9p: Add rest of 9p files to MAINTAINERS entry (diff) | |
| download | linux-899dd388853071f5c8848545209d4e2c5d95b1d9.tar.xz linux-899dd388853071f5c8848545209d4e2c5d95b1d9.zip | |
Merge tag 'for-linus-3.11-merge-window-part-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
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
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/client.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index addc116cecf0..01f1779eba80 100644 --- 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) @@ -996,6 +996,9 @@ struct p9_client *p9_client_create(const char *dev_name, char *options) 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(); if (clnt->trans_mod == NULL) { |