Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3706600pxf; Mon, 5 Apr 2021 20:51:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzoLgC4bW8N6ftEvjq1U0fPObwUp4b5I3lItVpbU5jDlCQZcQwyfrlZxNo4OPeaXVg3l9s0 X-Received: by 2002:a6b:e20a:: with SMTP id z10mr21569001ioc.99.1617681060748; Mon, 05 Apr 2021 20:51:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617681060; cv=none; d=google.com; s=arc-20160816; b=eBkNTNWX/jsqrFC3GWZDSWw6O1M1oAfxpO/5SoZ8M3yGpX+Ad2OdmGi2IVwXOgcDWk znhIxZbMMW2UCQ/K156xdcwVHEfXxVtWGvSNg9VZL0ImcDsdYRALkGGH5dWFYevSwSpl FNG+B/MyU8qvok1jOuElf/RPoHPrYmQgwyRIEFn8YqwdIbGWErETw6T8NKxqYSQh49y8 zjPPeZiOUr1Du5qtlweLqlyKSKpwotYe6BJrXgopgwFnOI5fbOh2jseVEZe0uoRXYQeJ WmF8K9HPa+slfwOKOxUdQO/VQzw7l9wGWj+v1m6WQ4iZzLrYkk7v187bobxEC4pifRmJ kQ9g== 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:to:from:subject; bh=4IFnz8LetelOzEfI83xzguJsF2O4/c+arxrv/Sl4Mcc=; b=xe/O4PeDm/ho8zq5CE3EE+O2MU5OpPAOOieue8dXx04mAawtGhZBasP5cgA0wyhchs Rf6h8zwV9HmtTwMuPsCqFoc7pncQ1FM+m/qBPpHXlgyTiLchjOsCgoH8hEtFh+JGc1BG BP0/NPbq2cM69ybrASdbUMXeTw+T7jZnkES19ifwixlJNrKAyYUOjLIKMgrAUMc5Vy72 AQUp8AbICc1VBQLg18ycaUnphEmFvziFtmS02AcuCtCHOoNTfSq2H1QPzcfaU+ta09RG 3cEHenh+XUoal+Q7YNo4i24q4jR4w9yWEYYotmAvxqrCBiOugCns6NaKGSy83s1F08SC TPnQ== 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 b14si17257018ion.78.2021.04.05.20.50.47; Mon, 05 Apr 2021 20:51:00 -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 S242434AbhDEQfA (ORCPT + 99 others); Mon, 5 Apr 2021 12:35:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:40720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239097AbhDEQfA (ORCPT ); Mon, 5 Apr 2021 12:35:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 391BC61398; Mon, 5 Apr 2021 16:34:54 +0000 (UTC) Subject: [PATCH v1 1/6] xprtrdma: rpcrdma_mr_pop() already does list_del_init() From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Mon, 05 Apr 2021 12:34:53 -0400 Message-ID: <161764049336.29855.1836712073865697630.stgit@manet.1015granger.net> In-Reply-To: <161764034907.29855.614994107807503843.stgit@manet.1015granger.net> References: <161764034907.29855.614994107807503843.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); } }