Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2777426pxb; Mon, 19 Apr 2021 13:45:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsSbrYNzJ42hVwnAIZgkesz08T3wXCNGbIUr6RR2SUeUEqQnB34FYXM8IWiGh+tMpuqbnB X-Received: by 2002:a17:90b:1bc1:: with SMTP id oa1mr983045pjb.46.1618865101147; Mon, 19 Apr 2021 13:45:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618865101; cv=none; d=google.com; s=arc-20160816; b=SMla33WgtypykqGccmkjLCSQm7Q7bKuTHTTfftrNQqvTiavxsuGId2Rw+6RyaBwbor 5xLgt9160DvhQTqKmlgpvh1lodmxHuOu9x0eYpU/+6WcCDq6DKqACeBJQrKCoF25EWs+ 7at2APjAelaQYKrXyyzAr6oldDDwDGoM6snr2NSG5z6o+DklalJAA/ibIbT9jmW7SFoU 9+HTonbqD/l5A7WsGOXwa+7PCiZAaU0LUp32nMWB4RzwvnTG0FtTNZKs5FqlMNIe83/c 7XNZvwGSYG6sXmOBOoEkFnsyn1XIDEU7ZVfadSHU+vFWUYpGB78bmfp+3ELKFu8aw6gA 9F2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject; bh=4IFnz8LetelOzEfI83xzguJsF2O4/c+arxrv/Sl4Mcc=; b=crRG1W9gxqjWepaW30vpdsEcHUeQO2EHpXr4DM0xtfrZuZvA+HP6lkNeIJt5ZuQPvo 7cIHMJLaSxLKDFtaHN+LtK0q6kjNQHBV/TTGuFpLxDDV1Owh7K2EREyWpiIvXgM9mqEy PJ/aMYW4q81mlqbHogf7KUQNYxieQXLCLJLaqneDdZ+YXBpDOqvIpeM3la2uHN+vcM0p v1JFbzHuk5atJU9uQ7kVBrEr02qnPsCSp0QPto8RT1oCNbasdF1SsxGd7VCUflRZEePg Vvm96Rvf4x/l1/S4sJ45tuF2m1RAJcxYAeBDCnEW3+qwxK9TyJFDAgWZ/zpxmO08s3sy zB9w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z15si10999391pgu.294.2021.04.19.13.44.47; Mon, 19 Apr 2021 13:45:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240548AbhDSSDZ (ORCPT + 99 others); Mon, 19 Apr 2021 14:03:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:41160 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240553AbhDSSDZ (ORCPT ); Mon, 19 Apr 2021 14:03:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C2D5261107; Mon, 19 Apr 2021 18:02:54 +0000 (UTC) Subject: [PATCH v3 12/26] xprtrdma: rpcrdma_mr_pop() already does list_del_init() From: Chuck Lever To: trondmy@hammerspace.com Cc: linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org Date: Mon, 19 Apr 2021 14:02:54 -0400 Message-ID: <161885537399.38598.8518849473861354102.stgit@manet.1015granger.net> In-Reply-To: <161885481568.38598.16682844600209775665.stgit@manet.1015granger.net> References: <161885481568.38598.16682844600209775665.stgit@manet.1015granger.net> User-Agent: StGit/0.23-29-ga622f1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org 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 --- net/sunrpc/xprtrdma/frwr_ops.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c index 132df9b59ab4..aca2228095db 100644 --- a/net/sunrpc/xprtrdma/frwr_ops.c +++ b/net/sunrpc/xprtrdma/frwr_ops.c @@ -576,7 +576,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); } }