From patchwork Thu Sep 15 14:57:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever III X-Patchwork-Id: 9333967 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 33597607FD for ; Thu, 15 Sep 2016 14:57:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27B92298E6 for ; Thu, 15 Sep 2016 14:57:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C385298ED; Thu, 15 Sep 2016 14:57:55 +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 6A5C3298EB for ; Thu, 15 Sep 2016 14:57:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751754AbcIOO5w (ORCPT ); Thu, 15 Sep 2016 10:57:52 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:35362 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751469AbcIOO5v (ORCPT ); Thu, 15 Sep 2016 10:57:51 -0400 Received: by mail-it0-f68.google.com with SMTP id e20so4697016itc.2; Thu, 15 Sep 2016 07:57:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=Ox7YDRh24JUXgGN/7eHQe7ZK8oouyvj1IwunxKN9L8I=; b=wcQvGME/m+Nu6YLYvajCjGOgh9E40M84yE/pEhC+feaTh/aXbVocItrYBiOFnU/Gk5 Swvv9tHoYhpdWzQyodHeRbWUw16nI+wHPiQTdswAh0Cv69zD6pYwv5C2Zi+7njZSqq3D z7N8hfH7gQTPP3IqnW8IV6Gzv4T7n5UUNgkfobBwL06cIIqTNoysG3I7KJ6t4JhePn0M ulKviPvsb8ESsG+walGsHNnzvoD/WKtGxqaZZwQKfgvdDzwKt5hD5FY+/keVlHy6QycL 7/kX6YTnRbJu7kZRF//JAFp9/jaYYoFRB0Kxa5z8p16hhFlD+LEqPg6EhrlPBVr6twPm S/jg== 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:cc:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=Ox7YDRh24JUXgGN/7eHQe7ZK8oouyvj1IwunxKN9L8I=; b=VG6XDLNmDUuBRsr55V/M7upr0pShfQQ1geYqGYP2n+2qQkVn07sHItkFHgo90TNrIm ElWp/ct224YL+SGHvL7Ad9Zs7kDYkibQDgLMxtGlKeFqw6+E1bPfA09RyYThX6/A8fIF G1OXWpskxG9lYQ2bCSJjZhh275xFR+oGPo0zgGA5SbDbd342s7n9TuRA4WQt0ELR2hTx 8FczJwi29xKGwoZr1ywWF4lClOmtWqzz5qOHkMVTtoideUz5BaAJ2qygQ83QB2spgtAQ uG8dE/GZ0fzZLolruqsg6Kcup9KvELHzqTciC+VSe44QcxzBL8aCsze2kY1sNdRz6g7U ybcA== X-Gm-Message-State: AE9vXwP5lO/FsLyUELs424fvcJysyKtX6OiKhvhagCfCOWkU3/A+G3QuqGCJUWKlxxFEKA== X-Received: by 10.107.50.67 with SMTP id y64mr9539812ioy.187.1473951469994; Thu, 15 Sep 2016 07:57:49 -0700 (PDT) Received: from manet.1015granger.net ([2604:8800:100:81fc:ec4:7aff:fe6c:1dce]) by smtp.gmail.com with ESMTPSA id j194sm347008ioe.39.2016.09.15.07.57.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Sep 2016 07:57:49 -0700 (PDT) Subject: [PATCH v3 21/22] xprtrdma: Rename rpcrdma_receive_wc() From: Chuck Lever To: anna.schumaker@netapp.com Cc: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Thu, 15 Sep 2016 10:57:49 -0400 Message-ID: <20160915145748.11080.20759.stgit@manet.1015granger.net> In-Reply-To: <20160915143440.11080.89241.stgit@manet.1015granger.net> References: <20160915143440.11080.89241.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 eeaca9c..48a2b67 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -161,13 +161,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, @@ -917,7 +917,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;