]> git.baikalelectronics.ru Git - kernel.git/commit
rpcrdma: Merge svcrdma and xprtrdma modules into one
authorChuck Lever <chuck.lever@oracle.com>
Thu, 4 Jun 2015 15:21:42 +0000 (11:21 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Thu, 4 Jun 2015 20:56:02 +0000 (16:56 -0400)
commit6897b165945f73bb7d41970688aeaecb0ada9cc3
treec0a56204cdd1f9f9bcde3f0d641bbcaf5414c15f
parent2af991d9b8b68670116cf9b873449a17dbcb7061
rpcrdma: Merge svcrdma and xprtrdma modules into one

Bi-directional RPC support means code in svcrdma.ko invokes a bit of
code in xprtrdma.ko, and vice versa. To avoid loader/linker loops,
merge the server and client side modules together into a single
module.

When backchannel capabilities are added, the combined module will
register all needed transport capabilities so that Upper Layer
consumers automatically have everything needed to create a
bi-directional transport connection.

Module aliases are added for backwards compatibility with user
space, which still may expect svcrdma.ko or xprtrdma.ko to be
present.

This commit reverts commit d202cf26e116 ("xprtrdma: add separate
Kconfig options for NFSoRDMA client and server support") and
provides a single CONFIG option for enabling the new module.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
net/sunrpc/Kconfig
net/sunrpc/Makefile
net/sunrpc/xprtrdma/Makefile
net/sunrpc/xprtrdma/module.c [new file with mode: 0644]
net/sunrpc/xprtrdma/svc_rdma.c
net/sunrpc/xprtrdma/transport.c
net/sunrpc/xprtrdma/xprt_rdma.h