From patchwork Mon Dec 14 21:30:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 7849081 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5F41FBEEE5 for ; Mon, 14 Dec 2015 21:30:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 93D2A2028D for ; Mon, 14 Dec 2015 21:30:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 942B3202C8 for ; Mon, 14 Dec 2015 21:30:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932290AbbLNVaU (ORCPT ); Mon, 14 Dec 2015 16:30:20 -0500 Received: from mail-io0-f174.google.com ([209.85.223.174]:33024 "EHLO mail-io0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932286AbbLNVaT (ORCPT ); Mon, 14 Dec 2015 16:30:19 -0500 Received: by iow186 with SMTP id 186so41337098iow.0; Mon, 14 Dec 2015 13:30:19 -0800 (PST) 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-type:content-transfer-encoding; bh=hb1x1UoFhHE4fWWAYAg0PFO1XqlUD70aLHDZw+OEQLk=; b=TewhfwoPStYi5D0CjGGy937jH2EPoq/TrsLy281AIbgr9r15zrXHFu5HIQZKEqZGON H28AoHVXHJAJskN2f8M3znVtFmX6g6KSymrqfjAsX0a0H1Zpr07hwJi3LuoGpgGB/8Ff jos3YtelqFhgsc4xaUYrt72GprSGavnUs3bS5j71YPvShHML99H07jQ/AnQTl5xwPvh2 6ik0pMMEqAIVCCwTNhsl6Wv4iRyEFC66vSgz1FYaHxPaBufy/GCfK3ZrONQMKhkViVSU qQmeWt+i/JSXVFbeReGHUdgkImwH6tndh4cC5rKJSn1kjO7pIs9G9UFaQR+gnhC97dZR gFrw== X-Received: by 10.107.163.6 with SMTP id m6mr12075918ioe.1.1450128619289; Mon, 14 Dec 2015 13:30:19 -0800 (PST) Received: from klimt.1015granger.net (c-68-46-169-226.hsd1.mi.comcast.net. [68.46.169.226]) by smtp.gmail.com with ESMTPSA id u24sm12668800ioi.14.2015.12.14.13.30.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Dec 2015 13:30:18 -0800 (PST) Subject: [PATCH v4 02/11] svcrdma: Clean up rdma_create_xprt() From: Chuck Lever To: bfields@fieldses.org Cc: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Mon, 14 Dec 2015 16:30:18 -0500 Message-ID: <20151214213018.12932.86138.stgit@klimt.1015granger.net> In-Reply-To: <20151214211951.12932.99017.stgit@klimt.1015granger.net> References: <20151214211951.12932.99017.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-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP kzalloc is used here, so setting the atomic fields to zero is unnecessary. sc_ord is set again in handle_connect_req. The other fields are re-initialized in svc_rdma_accept(). Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/svc_rdma_transport.c | 9 +-------- 1 file changed, 1 insertion(+), 8 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/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index 9f3eb89..27f338a 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c @@ -529,14 +529,6 @@ static struct svcxprt_rdma *rdma_create_xprt(struct svc_serv *serv, spin_lock_init(&cma_xprt->sc_rq_dto_lock); spin_lock_init(&cma_xprt->sc_frmr_q_lock); - cma_xprt->sc_ord = svcrdma_ord; - - cma_xprt->sc_max_req_size = svcrdma_max_req_size; - cma_xprt->sc_max_requests = svcrdma_max_requests; - cma_xprt->sc_sq_depth = svcrdma_max_requests * RPCRDMA_SQ_DEPTH_MULT; - atomic_set(&cma_xprt->sc_sq_count, 0); - atomic_set(&cma_xprt->sc_ctxt_used, 0); - if (listener) set_bit(XPT_LISTENER, &cma_xprt->sc_xprt.xpt_flags); @@ -918,6 +910,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt) (size_t)RPCSVC_MAXPAGES); newxprt->sc_max_sge_rd = min_t(size_t, dev->max_sge_rd, RPCSVC_MAXPAGES); + newxprt->sc_max_req_size = svcrdma_max_req_size; newxprt->sc_max_requests = min((size_t)dev->max_qp_wr, (size_t)svcrdma_max_requests); newxprt->sc_sq_depth = RPCRDMA_SQ_DEPTH_MULT * newxprt->sc_max_requests;