From patchwork Tue Feb 7 16:58:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9560677 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 98E6A602B1 for ; Tue, 7 Feb 2017 16:58:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BA5D1FF27 for ; Tue, 7 Feb 2017 16:58:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 809482842B; Tue, 7 Feb 2017 16:58:54 +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=ham 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 030371FF27 for ; Tue, 7 Feb 2017 16:58:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932172AbdBGQ6w (ORCPT ); Tue, 7 Feb 2017 11:58:52 -0500 Received: from mail-it0-f68.google.com ([209.85.214.68]:33439 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932163AbdBGQ6u (ORCPT ); Tue, 7 Feb 2017 11:58:50 -0500 Received: by mail-it0-f68.google.com with SMTP id e137so12872375itc.0; Tue, 07 Feb 2017 08:58:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=5EQyBhfQHjJIlIRYBLqWo/KNjNNS5VnT3VJH/X2gYlY=; b=cfWYK9J0adZ6cZ+rSiNaKs4dC1iEFn85ctBpcE5BFBMH9h081sId4Y16EH6OnynaEi cQiY1VvXsakzD9EockD8FDAaZlOpWLbrkfpFij3UTU0/FNiRWOZM5b1ZUxTOxWW6WuVd clg0+ckeUH1iP6I1wS0arWldHKngUSjsaOWIAyjdSqn+/oge/Yzt2qvqXIvUjiWIWSTG q+je89RcGTl9NivQNqwnrOaoQjHm3h3ghCnPtIYWMPiv6otI/KIbhT6MLyV/wbFLUiWj epXm7fZ+wP90xiW07Fyvq5xD11Op7mpsVT5wRAYVlnjgL8y3ORSa40uSrO34WoHcWjCh xLww== 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:cc:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=5EQyBhfQHjJIlIRYBLqWo/KNjNNS5VnT3VJH/X2gYlY=; b=QO3stBpuWO/LfTaJ8YQLlb9sDpE4Vdp7QjxwVc4bmZ9lQvoGU4A38z0rVbkAQLTsH3 NL6ufFJ7/tl6zHNElj819LGEtMwP+9anDaWnMconywIaKVUdL089l38hQjSSUE2sxVO4 Dr14Kk1AVeIqmMezVP9O2CAcQkFsgMYPPSAA2K9RJrY313WbWLwg8KcoZtztVQGrQPAj Sd4L9PCYoEX267mVGXov1dD8sZWTrfpPlqrAtzwSB0litLN6gH7WHM/sWSPwVOn01TFi YGaEJfOFT0ELOcGk+znjha67Bjb9t2R1mbpFl0b1iOE9KPmEp1vPRbPpmZjNParEe+GL urpg== X-Gm-Message-State: AIkVDXLk27hmPrYhKWASAdlxmMHgCDuQdWANRAA2zFRGey1V6How8ZhxR5sn7mZz4B+uhw== X-Received: by 10.36.52.197 with SMTP id z188mr13210009itz.71.1486486729608; Tue, 07 Feb 2017 08:58:49 -0800 (PST) Received: from klimt.1015granger.net ([2604:8800:100:81fc:ec4:7aff:fe6c:6aa0]) by smtp.gmail.com with ESMTPSA id r203sm6312943itc.5.2017.02.07.08.58.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Feb 2017 08:58:49 -0800 (PST) Subject: [PATCH v3 5/7] svcrdma: Remove unused sc_dto_q field From: Chuck Lever To: bfields@fieldses.org Cc: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Tue, 07 Feb 2017 11:58:48 -0500 Message-ID: <20170207165848.14422.69070.stgit@klimt.1015granger.net> In-Reply-To: <20170207165131.14422.47088.stgit@klimt.1015granger.net> References: <20170207165131.14422.47088.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 Reviewed-by: Christoph Hellwig --- 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 25ecf92..f77a7bc 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);