hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net/9p: remove virtio default hack and set appropriate bits instead 

A few releases back a patch made virtio the default transport, however
it was done in a way which side-stepped the mechanism put in place to
allow for this selection.  This patch cleans that up while maintaining
virtio as the default transport.

Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
This commit is contained in:
Eric Van Hensbergen 2013-11-12 10:20:03 -06:00
parent dd2a0a35c3
commit f94741fd28
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/9p/client.c
View File

@ -1011,9 +1011,6 @@ struct p9_client *p9_client_create(const char *dev_name, char *options)
if (err < 0) if (err < 0)
goto destroy_tagpool; goto destroy_tagpool;
if (!clnt->trans_mod)
clnt->trans_mod = v9fs_get_trans_by_name("virtio");
if (!clnt->trans_mod) if (!clnt->trans_mod)
clnt->trans_mod = v9fs_get_default_trans(); clnt->trans_mod = v9fs_get_default_trans();

2
net/9p/trans_fd.c
View File

@ -1048,7 +1048,7 @@ p9_fd_create(struct p9_client *client, const char *addr, char *args)
static struct p9_trans_module p9_tcp_trans = { static struct p9_trans_module p9_tcp_trans = {
.name = "tcp", .name = "tcp",
.maxsize = MAX_SOCK_BUF, .maxsize = MAX_SOCK_BUF,
.def = 1, .def = 0,
.create = p9_fd_create_tcp, .create = p9_fd_create_tcp,
.close = p9_fd_close, .close = p9_fd_close,
.request = p9_fd_request, .request = p9_fd_request,

2
net/9p/trans_virtio.c
View File

@ -698,7 +698,7 @@ static struct p9_trans_module p9_virtio_trans = {
* page in zero copy. * page in zero copy.
*/ */
.maxsize = PAGE_SIZE * (VIRTQUEUE_NUM - 3), .maxsize = PAGE_SIZE * (VIRTQUEUE_NUM - 3),
.def = 0, .def = 1,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };