diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-07-22 22:31:17 +0200 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-07-22 22:33:59 +0200 |
| commit | 68514471ceceac63c7fa9ad684d882f41be5b2d8 (patch) | |
| tree | f902c3a0227db1e0c0563b9eeae57a2ae19c75a6 /net/sunrpc | |
| parent | pNFS: Don't throw out valid layout segments (diff) | |
| download | linux-68514471ceceac63c7fa9ad684d882f41be5b2d8.tar.xz linux-68514471ceceac63c7fa9ad684d882f41be5b2d8.zip | |
SUNRPC: Fix a backchannel deadlock
xprt_alloc_bc_request() cannot call xprt_free_bc_request() without
deadlocking, since it already holds the xprt->bc_pa_lock.
Reported-by: Chuck Lever <chuck.lever@oracle.com>
Fixes: 0d2a970d0ae55 ("SUNRPC: Fix a backchannel race")
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/backchannel_rqst.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/backchannel_rqst.c b/net/sunrpc/backchannel_rqst.c index 9825ff0f91d6..5a3b50aec397 100644 --- a/net/sunrpc/backchannel_rqst.c +++ b/net/sunrpc/backchannel_rqst.c @@ -240,8 +240,8 @@ static struct rpc_rqst *xprt_alloc_bc_request(struct rpc_xprt *xprt, __be32 xid) req = xprt_alloc_bc_req(xprt, GFP_ATOMIC); if (!req) goto not_found; - /* Note: this 'free' request adds it to xprt->bc_pa_list */ - xprt_free_bc_request(req); + list_add_tail(&req->rq_bc_pa_list, &xprt->bc_pa_list); + xprt->bc_alloc_count++; } req = list_first_entry(&xprt->bc_pa_list, struct rpc_rqst, rq_bc_pa_list); |