From patchwork Tue Aug 23 17:54:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9296071 X-Patchwork-Delegate: Trond.Myklebust@netapp.com 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 AE395608A7 for ; Tue, 23 Aug 2016 17:55:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1AD828CA3 for ; Tue, 23 Aug 2016 17:55:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93E5428B2C; Tue, 23 Aug 2016 17:55:12 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 444EA28BD5 for ; Tue, 23 Aug 2016 17:55:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754554AbcHWRy6 (ORCPT ); Tue, 23 Aug 2016 13:54:58 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:32768 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753302AbcHWRy4 (ORCPT ); Tue, 23 Aug 2016 13:54:56 -0400 Received: by mail-it0-f65.google.com with SMTP id d65so8829482ith.0; Tue, 23 Aug 2016 10:54:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:from:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=VWCXRCqZz9Oggy+ac5LxxHhk4/h/JbaFM1Jad4tNpVw=; b=zHIVA7le3t+Zz0/l8E0BZaZU1M36MDlvFXIHPtThHXAV9Rsnm58AxLUlXK6vtLSp5B 4KMziWNkD51SLftWgUU7lo4YPlWjN9b0PShy75jKLNb2gAiKBjYtGVYKa3Oh3JdurE6q H59uoXNSCpIxp/QCTQRTyXmgePlh2Ut1p0yjKkfI7yr884fa/S43OY1RzJ825pBc0P8X FDiU87PgGae+Jgnwp7Q7L13osWp1B6gQKOj2N+GAIEERg5IrAzGyslFdcSncTqYXOlg0 atyBcpHDVCfQl8S7UsoHMpGDqqMg19HN515x8m5XvdSlKQQQbQdHheyTeJndM5xeS8w/ nXUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:from:to:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=VWCXRCqZz9Oggy+ac5LxxHhk4/h/JbaFM1Jad4tNpVw=; b=E2uqNp8Mv0BsA4MoZHoaygKrOWHx0lR3a1FwtQua5o+62ukmSkhLIubLEWOP6I+Tj2 4AsfwERRXKk0mXMn3LpSTsQIdNOmId4b5iFNR1PYGrtj7JFE3nCEE0cZEuf0J6Bv39if O6aisHdnZybnmezsgt3MawjYwUsZ4wAcCqeSMEadOzoZfQSJThCv9ZV/s/LLAC1znJ8Y KsJBFRdxvILK9f55XdP0WZoK2Y0Z+HbeV4gkLLUUiTl2WNgOy2YLGaSvpr04baxgSJBF ylz/lo4mlPoGAzrfBavkjOANVLPRdhvkI5ANjPJbKTlB8gCerpJldQXJlVIx1aCm5MLM evIw== X-Gm-Message-State: AEkoouus8hQQuxTHaaunp2B7xVPYQwcFb4iIasFbNz0hnDkacftbeOvpw24O5csd22sbiA== X-Received: by 10.107.55.135 with SMTP id e129mr36765682ioa.129.1471974895944; Tue, 23 Aug 2016 10:54:55 -0700 (PDT) Received: from manet.1015granger.net ([2604:8800:100:81fc:ec4:7aff:fe6c:1dce]) by smtp.gmail.com with ESMTPSA id e125sm1757042ith.20.2016.08.23.10.54.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Aug 2016 10:54:55 -0700 (PDT) Subject: [PATCH v2 21/22] xprtrdma: Rename rpcrdma_receive_wc() From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Tue, 23 Aug 2016 13:54:55 -0400 Message-ID: <20160823175454.13038.95325.stgit@manet.1015granger.net> In-Reply-To: <20160823174402.13038.84561.stgit@manet.1015granger.net> References: <20160823174402.13038.84561.stgit@manet.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: When converting xprtrdma to use the new CQ API, I missed a spot. The naming convention elsewhere is: {svc_rdma,rpcrdma}_wc_{operation} Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/verbs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 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/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 4b09ccf..83f7886 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -160,13 +160,13 @@ rpcrdma_update_granted_credits(struct rpcrdma_rep *rep) } /** - * rpcrdma_receive_wc - Invoked by RDMA provider for each polled Receive WC + * rpcrdma_wc_receive - Invoked by RDMA provider for each polled Receive WC * @cq: completion queue (ignored) * @wc: completed WR * */ static void -rpcrdma_receive_wc(struct ib_cq *cq, struct ib_wc *wc) +rpcrdma_wc_receive(struct ib_cq *cq, struct ib_wc *wc) { struct ib_cqe *cqe = wc->wr_cqe; struct rpcrdma_rep *rep = container_of(cqe, struct rpcrdma_rep, @@ -916,7 +916,7 @@ rpcrdma_create_rep(struct rpcrdma_xprt *r_xprt) } rep->rr_device = ia->ri_device; - rep->rr_cqe.done = rpcrdma_receive_wc; + rep->rr_cqe.done = rpcrdma_wc_receive; rep->rr_rxprt = r_xprt; INIT_WORK(&rep->rr_work, rpcrdma_receive_worker); rep->rr_recv_wr.next = NULL;