diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-26 10:55:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-26 10:55:41 -0800 |
| commit | 1c2948380b699dfdbb25a7de740392dd9e6f0613 (patch) | |
| tree | f1a9fc2903c0cc85b24dd2fb279f89597976670d /net | |
| parent | b2e448eca1a52fea181905845728ae00a138d84e (diff) | |
| parent | b871866e4aa3f44b10f0f0ce004cc4635c2e58a5 (diff) | |
| download | linux-1c2948380b699dfdbb25a7de740392dd9e6f0613.tar.gz linux-1c2948380b699dfdbb25a7de740392dd9e6f0613.tar.bz2 linux-1c2948380b699dfdbb25a7de740392dd9e6f0613.zip | |
Merge tag 'for-3.14-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
Pull 9p changes from Eric Van Hensbergen:
"Included are a new cache model for support of mmap, and several
cleanups across the filesystem and networking portions of the code"
* tag 'for-3.14-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: update documentation
9P: introduction of a new cache=mmap model.
net/9p: remove virtio default hack and set appropriate bits instead
9p: remove useless 'name' variable and assignment
9p: fix return value in case in v9fs_fid_xattr_set()
9p: remove useless variable and assignment
9p: remove useless assignment
9p: remove unused 'super_block' struct pointer
9p: remove never used return variable
9p: remove unused 'p9_fid' struct pointer
9p: remove unused 'p9_client' struct pointer
Diffstat (limited to 'net')
| -rw-r--r-- | net/9p/client.c | 3 | ||||
| -rw-r--r-- | net/9p/trans_fd.c | 2 | ||||
| -rw-r--r-- | net/9p/trans_virtio.c | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index ee8fd6bd4035..a5e4d2dcb03e 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -1012,9 +1012,6 @@ 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) { diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index 9321a7763067..b7bd7f2961bf 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c @@ -1048,7 +1048,7 @@ p9_fd_create(struct p9_client *client, const char *addr, char *args) static struct p9_trans_module p9_tcp_trans = { .name = "tcp", .maxsize = MAX_SOCK_BUF, - .def = 1, + .def = 0, .create = p9_fd_create_tcp, .close = p9_fd_close, .request = p9_fd_request, diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 9c5a1aa34d12..cd1e1ede73a4 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -698,7 +698,7 @@ static struct p9_trans_module p9_virtio_trans = { * page in zero copy. */ .maxsize = PAGE_SIZE * (VIRTQUEUE_NUM - 3), - .def = 0, + .def = 1, .owner = THIS_MODULE, }; |