From: Chuck Lever <chuck.lever@oracle.com>
Date: Mon, 19 Apr 2021 18:02:54 +0000 (-0400)
Subject: xprtrdma: rpcrdma_mr_pop() already does list_del_init()
X-Git-Tag: v5.10.38~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04dad2ca1f5e460296b983d332cff642055c4def;p=thirdparty%2Fkernel%2Fstable.git

xprtrdma: rpcrdma_mr_pop() already does list_del_init()

[ 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>
---

diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c
index 8f96bb0a60611..bf3627dce5529 100644
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@ -555,7 +555,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);
 	}
 }