Commit 07880fa4 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields

svcrdma: Remove try_module_get from backchannel

Since commit ffe1f0df ("rpcrdma: Merge svcrdma and xprtrdma
modules into one"), the forward and backchannel components are part
of the same kernel module. A separate try_module_get() call in the
backchannel code is no longer necessary.
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 596f2a19
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
* Support for backward direction RPCs on RPC/RDMA (server-side). * Support for backward direction RPCs on RPC/RDMA (server-side).
*/ */
#include <linux/module.h>
#include <linux/sunrpc/svc_rdma.h> #include <linux/sunrpc/svc_rdma.h>
#include "xprt_rdma.h" #include "xprt_rdma.h"
...@@ -255,7 +253,6 @@ xprt_rdma_bc_put(struct rpc_xprt *xprt) ...@@ -255,7 +253,6 @@ xprt_rdma_bc_put(struct rpc_xprt *xprt)
dprintk("svcrdma: %s: xprt %p\n", __func__, xprt); dprintk("svcrdma: %s: xprt %p\n", __func__, xprt);
xprt_free(xprt); xprt_free(xprt);
module_put(THIS_MODULE);
} }
static const struct rpc_xprt_ops xprt_rdma_bc_procs = { static const struct rpc_xprt_ops xprt_rdma_bc_procs = {
...@@ -327,20 +324,9 @@ xprt_setup_rdma_bc(struct xprt_create *args) ...@@ -327,20 +324,9 @@ xprt_setup_rdma_bc(struct xprt_create *args)
args->bc_xprt->xpt_bc_xprt = xprt; args->bc_xprt->xpt_bc_xprt = xprt;
xprt->bc_xprt = args->bc_xprt; xprt->bc_xprt = args->bc_xprt;
if (!try_module_get(THIS_MODULE))
goto out_fail;
/* Final put for backchannel xprt is in __svc_rdma_free */ /* Final put for backchannel xprt is in __svc_rdma_free */
xprt_get(xprt); xprt_get(xprt);
return xprt; return xprt;
out_fail:
xprt_rdma_free_addresses(xprt);
args->bc_xprt->xpt_bc_xprt = NULL;
args->bc_xprt->xpt_bc_xps = NULL;
xprt_put(xprt);
xprt_free(xprt);
return ERR_PTR(-EINVAL);
} }
struct xprt_class xprt_rdma_bc = { struct xprt_class xprt_rdma_bc = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment