diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-03-26 15:21:59 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-03-26 15:21:59 -0400 |
| commit | 0f96371a30f16f6244195c717b9e2b2f42aa4e89 (patch) | |
| tree | 3f42b4abf3a7643ddd06f0c7727f2e3b06798c3c /net/sunrpc | |
| parent | e021bb4fb77a8782d21cab4cb0702778fc3784c7 (diff) | |
| parent | ce194fa2b267e2018f42442347d90df01c4071d6 (diff) | |
Merge tag 'v4.19.29' into v4.19-rt
This is the 4.19.29 stable release
Conflicts:
drivers/irqchip/irq-gic-v3-its.c
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/xprtrdma/verbs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 956a5ea47b58..3d6bf790cf1f 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -872,7 +872,7 @@ static int rpcrdma_sendctxs_create(struct rpcrdma_xprt *r_xprt) for (i = 0; i <= buf->rb_sc_last; i++) { sc = rpcrdma_sendctx_create(&r_xprt->rx_ia); if (!sc) - goto out_destroy; + return -ENOMEM; sc->sc_xprt = r_xprt; buf->rb_sc_ctxs[i] = sc; @@ -880,10 +880,6 @@ static int rpcrdma_sendctxs_create(struct rpcrdma_xprt *r_xprt) buf->rb_flags = 0; return 0; - -out_destroy: - rpcrdma_sendctxs_destroy(buf); - return -ENOMEM; } /* The sendctx queue is not guaranteed to have a size that is a |