From patchwork Tue Jan 24 20:35:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9535861 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5B864601D3 for ; Tue, 24 Jan 2017 20:35:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A2BD26907 for ; Tue, 24 Jan 2017 20:35:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F1C626E51; Tue, 24 Jan 2017 20:35:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4878326E16 for ; Tue, 24 Jan 2017 20:35:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750896AbdAXUfP (ORCPT ); Tue, 24 Jan 2017 15:35:15 -0500 Received: from mail-it0-f68.google.com ([209.85.214.68]:33834 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750733AbdAXUfN (ORCPT ); Tue, 24 Jan 2017 15:35:13 -0500 Received: by mail-it0-f68.google.com with SMTP id o185so15172771itb.1; Tue, 24 Jan 2017 12:35:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=DxuVk1SiiIXFVx5nFj1NbTURTfAF7VZTdHqq3jD4EPk=; b=pKywUkAaWRrA0EQA+gMnSRjOR1uIYMiALYPEtnoboekwAoZitLDECSSRSLDFtM11RC GlyCeByUnf+zZkxvTLKoEypyk/2ayBanxyNaWKiEQTKV0lCWAYnMVU5ogcLuT5wke4XW No/uMHLrq60/qV9rCMLjvaSFB68pEqIBeozElQX4ilUVKqrRYWxUsvt7qBaz43np8GjQ sV8DvuEPrjyffqnBoUIl0AeL6e8NLiGoN9nEOlI88CP3j6rSgLhBLul+uGrG9w/MVMbp lmcmlGTHYKGl2YfPtJiKmTAw81SIIflx5EA0sYcSs4Ko82YBh1SKBQX1YIiiR/hg7Xe6 Y8+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=DxuVk1SiiIXFVx5nFj1NbTURTfAF7VZTdHqq3jD4EPk=; b=BJ99yb44gGqoZugiu5G/Uy84Podsk4QVgrqTK6By1PhsDtee5O9CPw3FjaFIeamOoC wLyrOW1Pu+s7vRjsTW/38pKePHVJJhkoOIR+yXIf02bzMyBHksafr7XG2m9wv4nVAixv KJuwxegjqil342M9QKtYe3W96T6vVs8YIWqkJlGeeKvpyjffrqFHNnzVUV8Nr6tnyWm1 S8VKw//QDy9dLW4dol/j2aoAF0SxLLzRGCGL/eFBdbFesobA3POkHxZ5KeQ2dGWttxV6 Vt7fHQADhXb26PQBDzRMKi4qswS2WDriX9RTBV5MxbMVKjKYzUHT26tLLpq56rE7QbrI bwpg== X-Gm-Message-State: AIkVDXIbQxBPboDxgC+k4RJNXRSjL4eiCUq0Jq1qmsnbylGlAF140P8km77ClC00c8LjlQ== X-Received: by 10.36.94.21 with SMTP id h21mr22274772itb.78.1485290112518; Tue, 24 Jan 2017 12:35:12 -0800 (PST) Received: from klimt.1015granger.net ([2604:8800:100:81fc:ec4:7aff:fe6c:6aa0]) by smtp.gmail.com with ESMTPSA id k66sm233881itg.8.2017.01.24.12.35.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 12:35:12 -0800 (PST) Subject: [PATCH v1 5/7] svcrdma: Remove unused sc_dto_q field From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Tue, 24 Jan 2017 15:35:11 -0500 Message-ID: <20170124203511.11807.38321.stgit@klimt.1015granger.net> In-Reply-To: <20170124193242.11807.91861.stgit@klimt.1015granger.net> References: <20170124193242.11807.91861.stgit@klimt.1015granger.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Clean up. Commit be99bb11400c ("svcrdma: Use new CQ API for RPC-over-RDMA server send CQs") removed code that used the sc_dto_q field, but neglected to remove sc_dto_q at the same time. Fixes: be99bb11400c ("svcrdma: Use new CQ API for RPC-over- ...") Signed-off-by: Chuck Lever --- include/linux/sunrpc/svc_rdma.h | 1 - net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 - 2 files changed, 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h index 5549bdb..aaa2477 100644 --- a/include/linux/sunrpc/svc_rdma.h +++ b/include/linux/sunrpc/svc_rdma.h @@ -172,7 +172,6 @@ struct svcxprt_rdma { wait_queue_head_t sc_send_wait; /* SQ exhaustion waitlist */ unsigned long sc_flags; - struct list_head sc_dto_q; /* DTO tasklet I/O pending Q */ struct list_head sc_read_complete_q; struct work_struct sc_work; }; diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index 174928f..023eaa0 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c @@ -557,7 +557,6 @@ static struct svcxprt_rdma *rdma_create_xprt(struct svc_serv *serv, return NULL; svc_xprt_init(&init_net, &svc_rdma_class, &cma_xprt->sc_xprt, serv); INIT_LIST_HEAD(&cma_xprt->sc_accept_q); - INIT_LIST_HEAD(&cma_xprt->sc_dto_q); INIT_LIST_HEAD(&cma_xprt->sc_rq_dto_q); INIT_LIST_HEAD(&cma_xprt->sc_read_complete_q); INIT_LIST_HEAD(&cma_xprt->sc_frmr_q);