]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
xprtrdma: rpcrdma_mr_pop() already does list_del_init()
authorChuck Lever <chuck.lever@oracle.com>
Mon, 19 Apr 2021 18:02:54 +0000 (14:02 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 May 2021 08:29:42 +0000 (10:29 +0200)
[ Upstream commit 1363e6388c363d0433f9aa4e2f33efe047572687 ]

The rpcrdma_mr_pop() earlier in the function has already cleared
out mr_list, so it must not be done again in the error path.

Fixes: 847568942f93 ("xprtrdma: Remove fr_state")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/sunrpc/xprtrdma/frwr_ops.c

index e8b25f9290ab20e4db0633c49661ece159b5b9f4..0104430e4c8e16c080405eb24fbe638cd99acd2c 100644 (file)
@@ -582,7 +582,6 @@ void frwr_unmap_sync(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req)
                mr = container_of(frwr, struct rpcrdma_mr, frwr);
                bad_wr = bad_wr->next;
 
-               list_del_init(&mr->mr_list);
                frwr_mr_recycle(mr);
        }
 }