From patchwork Wed Nov 9 17:34:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9419913 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 589AA60512 for ; Wed, 9 Nov 2016 17:54:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EA4E29360 for ; Wed, 9 Nov 2016 17:54:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4280529365; Wed, 9 Nov 2016 17:54:10 +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 2728C29360 for ; Wed, 9 Nov 2016 17:54:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753980AbcKIRyH (ORCPT ); Wed, 9 Nov 2016 12:54:07 -0500 Received: from mail-it0-f68.google.com ([209.85.214.68]:35701 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753760AbcKIRyG (ORCPT ); Wed, 9 Nov 2016 12:54:06 -0500 Received: by mail-it0-f68.google.com with SMTP id b123so18194650itb.2; Wed, 09 Nov 2016 09:54:06 -0800 (PST) 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=cSbvjUyPBlfkmw13raPKiFw6Gz+yM3M2JwUhy0+TCKI=; b=PbzadVAGQ/4lXY1aCWdbsVQkeiglfV4MP5Na6jlXYtgVVDfmZyxNBnnO+u3qoJNJ3F PDQfFrpkdZQwIqCDvv/kVZdfViAMpOkZEUFq+7FgnIUIl9eWHALtrOWExErucSLtyChF +u6pGXtT1RBQ9Yqye8+hGsOo98eNVw4zwDUd6NrYd69+Gkx+WNY0oTGj6YGRHGypZQYa YdoSKEwy4QxBpsRkF8DQZ51FlfPlLMh45kRI+o/Tu1iSWE3iYH9kP0YDJzHStqf0nPSk gdPvE1TclL39nq0JhiOeG3TdhTdt7RnIIvHyYH2KjfL372oDlbnDvFm8p29hJTNwevHB kYoQ== 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=cSbvjUyPBlfkmw13raPKiFw6Gz+yM3M2JwUhy0+TCKI=; b=LCGEsv/aMFHjYPt9mZGopZysGwrydqDxkJPq9tl7mYg1BMdRecsB5PIfPKxItwbTBc D6sB6+YFpTIzw9KHcg0PgEAinLCWdBf0bpi43YXGwa4VIG7/sGQYP0UlIlOQKDdK8ISQ riG8LgqgKLW0+dZnYwcD+8LePEoo+L3ZtjH51MoUa20Ohxq/MmGT4/WCbNSnKJLR+B27 wVLi5UgleIaXGVS9xayDVPPVPJsrNFvciYs7VImrgAvCegQasCMf1iwTrbGdbjOf4Fo5 OnMGlBJDWbo6J+C3JXPpLFE4dCU2tXxquAaRC2pjWeMDteWF/yZHDZZZTs7prAU9kCjd OO3A== X-Gm-Message-State: ABUngvdZzcPSkIGi7eHdEM6cDP1m+IO1iQcWecXeiFz+SAsWSn5vkUHnuBk7+5wfX3pGNg== X-Received: by 10.107.50.12 with SMTP id y12mr1405656ioy.159.1478712867486; Wed, 09 Nov 2016 09:34:27 -0800 (PST) Received: from klimt.1015granger.net ([2604:8800:100:81fc:ec4:7aff:fe6c:6aa0]) by smtp.gmail.com with ESMTPSA id n131sm418403itb.20.2016.11.09.09.34.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Nov 2016 09:34:27 -0800 (PST) Subject: [PATCH v1 6/7] svcrdma: Remove svc_rdma_op_ctxt::wc_status From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Wed, 09 Nov 2016 12:34:26 -0500 Message-ID: <20161109173426.15735.61869.stgit@klimt.1015granger.net> In-Reply-To: <20161109165814.15735.47815.stgit@klimt.1015granger.net> References: <20161109165814.15735.47815.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: Completion status is already reported in the individual completion handlers. Save a few bytes in struct svc_rdma_op_ctxt. Signed-off-by: Chuck Lever --- include/linux/sunrpc/svc_rdma.h | 1 - net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 4 ++-- net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 - 3 files changed, 2 insertions(+), 4 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 43d7c70..757fb96 100644 --- a/include/linux/sunrpc/svc_rdma.h +++ b/include/linux/sunrpc/svc_rdma.h @@ -79,7 +79,6 @@ struct svc_rdma_op_ctxt { struct ib_cqe reg_cqe; struct ib_cqe inv_cqe; struct list_head dto_q; - enum ib_wc_status wc_status; u32 byte_len; u32 position; struct svcxprt_rdma *xprt; diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index bf18811..02215d6 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c @@ -640,8 +640,8 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) goto defer; goto out; } - dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n", - ctxt, rdma_xprt, rqstp, ctxt->wc_status); + dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p\n", + ctxt, rdma_xprt, rqstp); atomic_inc(&rdma_stat_recv); /* Build up the XDR from the receive buffers. */ diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index ceff814..b7c9359 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c @@ -393,7 +393,6 @@ static void svc_rdma_wc_receive(struct ib_cq *cq, struct ib_wc *wc) /* WARNING: Only wc->wr_cqe and wc->status are reliable */ ctxt = container_of(cqe, struct svc_rdma_op_ctxt, cqe); - ctxt->wc_status = wc->status; svc_rdma_unmap_dma(ctxt); if (wc->status != IB_WC_SUCCESS)