Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+2 -5
-3
net/9p/client.c
··· 1012 1012 goto destroy_tagpool; 1013 1013 1014 1014 if (!clnt->trans_mod) 1015 - clnt->trans_mod = v9fs_get_trans_by_name("virtio"); 1016 - 1017 - if (!clnt->trans_mod) 1018 1015 clnt->trans_mod = v9fs_get_default_trans(); 1019 1016 1020 1017 if (clnt->trans_mod == NULL) {
+1 -1
net/9p/trans_fd.c
··· 1048 1048 static struct p9_trans_module p9_tcp_trans = { 1049 1049 .name = "tcp", 1050 1050 .maxsize = MAX_SOCK_BUF, 1051 - .def = 1, 1051 + .def = 0, 1052 1052 .create = p9_fd_create_tcp, 1053 1053 .close = p9_fd_close, 1054 1054 .request = p9_fd_request,
+1 -1
net/9p/trans_virtio.c
··· 698 698 * page in zero copy. 699 699 */ 700 700 .maxsize = PAGE_SIZE * (VIRTQUEUE_NUM - 3), 701 - .def = 0, 701 + .def = 1, 702 702 .owner = THIS_MODULE, 703 703 }; 704 704