Received: by 2002:a05:7412:b130:b0:e2:908c:2ebd with SMTP id az48csp1670533rdb; Sun, 19 Nov 2023 05:58:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IHAcIeeXMxhQzBnpCpzAPEDRY5CkXyeu9cNq58HQww/E1AKBF4TAW9E+V4GGDa3/8ioLSf2 X-Received: by 2002:a05:6808:1642:b0:3b2:f54b:8b1f with SMTP id az2-20020a056808164200b003b2f54b8b1fmr5896373oib.35.1700402321035; Sun, 19 Nov 2023 05:58:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700402321; cv=none; d=google.com; s=arc-20160816; b=VMNoU+oTZrJ4lvUE7HRj6PloCRWh5HpX31rGNrIDylwy7Ch6G0vCIH1vsjzw4NYl2a s/bd+iaEmA1244HhXI43y8gscCbxkyi9zrGHbbkCByBsfKmiVwiXRRVGUn+Ik2PjAtT0 7+FQ3KaaaN+i5Ho9Iy5x7z9R8oKbhx5R3UUKA/eGsa0IrBjeIkh/D6loLwEW04kVuc2y jv702FviUESq82bKP3heYblHm4CANclrbN2v7q5DS3FlGBWgVOAnHJsPEgi453fawfBX qx9Z/FdcWxy1nIB9PsD3mQdZq5NoWFuoQ0LbncJOzvHtWrnvPBJHjbwLNZ6ZfMy561jX Hf9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=epH7li2KTs6whcmwT7EPwH3CU0173ZXcM7KQ+eev7G8=; fh=KQ6DtOg2s6EjX2UG8PvNJAxkkgxsPAP99idIif6uGd8=; b=ferdYucQQ0MAPpcHS43zGV4QEMKwV1hHwsIfSIAzL6A0ATHGnhniCZzA8nRPsP4uTy /Q79XMN+5K6CPzqQoTBpQpJCcx2pChqzthIRVH6zbssYU5EGac+7xX3/JLzLrUgoDJSY GnwSI0Ryc3/uHZaa+JxtjQGclQ0GVcCBrUNcaVeUQqzbbrTBAn3UY1Usg+Dx8/NaZKni 65Dh+uEqbUP7xQzaeT3OGI0HkNVVHNTzJSoN52jgDOwHRfl/WpBbHAB/YD8y0l5bAVvB CfjhfNDbyiu5dBIusdTINFGm1s4P1NsluRudaRceAZ6y4P+wFlyKiUSMR4nTywGwHedl KP0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id n16-20020aa79850000000b006c33c8497b8si6099551pfq.170.2023.11.19.05.58.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Nov 2023 05:58:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 320F880A9AB5; Sun, 19 Nov 2023 05:58:34 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231298AbjKSN6L (ORCPT + 99 others); Sun, 19 Nov 2023 08:58:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229441AbjKSN6J (ORCPT ); Sun, 19 Nov 2023 08:58:09 -0500 Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C7F8E6; Sun, 19 Nov 2023 05:58:05 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R991e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046049;MF=guwen@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0VwebcEG_1700402280; Received: from localhost(mailfrom:guwen@linux.alibaba.com fp:SMTPD_---0VwebcEG_1700402280) by smtp.aliyun-inc.com; Sun, 19 Nov 2023 21:58:02 +0800 From: Wen Gu To: wintera@linux.ibm.com, wenjia@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, kgraul@linux.ibm.com, jaka@linux.ibm.com Cc: borntraeger@linux.ibm.com, svens@linux.ibm.com, alibuda@linux.alibaba.com, tonylu@linux.alibaba.com, guwen@linux.alibaba.com, raspl@linux.ibm.com, schnelle@linux.ibm.com, linux-s390@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/7] net/smc: Rename some variable 'fce' to 'fce_v2x' for clarity Date: Sun, 19 Nov 2023 21:57:51 +0800 Message-Id: <1700402277-93750-2-git-send-email-guwen@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1700402277-93750-1-git-send-email-guwen@linux.alibaba.com> References: <1700402277-93750-1-git-send-email-guwen@linux.alibaba.com> X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sun, 19 Nov 2023 05:58:34 -0800 (PST) Rename some smc_clc_first_contact_ext_v2x type variables to 'fce_v2x' to distinguish them from smc_clc_first_contact_ext type variables. Signed-off-by: Wen Gu --- net/smc/smc_clc.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c index 8deb46c..f2f86c2 100644 --- a/net/smc/smc_clc.c +++ b/net/smc/smc_clc.c @@ -418,15 +418,15 @@ static bool smc_clc_msg_prop_valid(struct smc_clc_msg_proposal *pclc) return true; } -static int smc_clc_fill_fce(struct smc_clc_first_contact_ext_v2x *fce, +static int smc_clc_fill_fce(struct smc_clc_first_contact_ext_v2x *fce_v2x, struct smc_init_info *ini) { - int ret = sizeof(*fce); + int ret = sizeof(*fce_v2x); - memset(fce, 0, sizeof(*fce)); - fce->fce_v2_base.os_type = SMC_CLC_OS_LINUX; - fce->fce_v2_base.release = ini->release_nr; - memcpy(fce->fce_v2_base.hostname, smc_hostname, sizeof(smc_hostname)); + memset(fce_v2x, 0, sizeof(*fce_v2x)); + fce_v2x->fce_v2_base.os_type = SMC_CLC_OS_LINUX; + fce_v2x->fce_v2_base.release = ini->release_nr; + memcpy(fce_v2x->fce_v2_base.hostname, smc_hostname, sizeof(smc_hostname)); if (ini->is_smcd && ini->release_nr < SMC_RELEASE_1) { ret = sizeof(struct smc_clc_first_contact_ext); goto out; @@ -434,8 +434,8 @@ static int smc_clc_fill_fce(struct smc_clc_first_contact_ext_v2x *fce, if (ini->release_nr >= SMC_RELEASE_1) { if (!ini->is_smcd) { - fce->max_conns = ini->max_conns; - fce->max_links = ini->max_links; + fce_v2x->max_conns = ini->max_conns; + fce_v2x->max_links = ini->max_links; } } @@ -1002,8 +1002,8 @@ static int smc_clc_send_confirm_accept(struct smc_sock *smc, int first_contact, u8 version, u8 *eid, struct smc_init_info *ini) { + struct smc_clc_first_contact_ext_v2x fce_v2x; struct smc_connection *conn = &smc->conn; - struct smc_clc_first_contact_ext_v2x fce; struct smc_clc_msg_accept_confirm *clc; struct smc_clc_fce_gid_ext gle; struct smc_clc_msg_trail trl; @@ -1036,7 +1036,7 @@ static int smc_clc_send_confirm_accept(struct smc_sock *smc, memcpy(clc_v2->d1.eid, eid, SMC_MAX_EID_LEN); len = SMCD_CLC_ACCEPT_CONFIRM_LEN_V2; if (first_contact) { - fce_len = smc_clc_fill_fce(&fce, ini); + fce_len = smc_clc_fill_fce(&fce_v2x, ini); len += fce_len; } clc_v2->hdr.length = htons(len); @@ -1082,9 +1082,9 @@ static int smc_clc_send_confirm_accept(struct smc_sock *smc, memcpy(clc_v2->r1.eid, eid, SMC_MAX_EID_LEN); len = SMCR_CLC_ACCEPT_CONFIRM_LEN_V2; if (first_contact) { - fce_len = smc_clc_fill_fce(&fce, ini); + fce_len = smc_clc_fill_fce(&fce_v2x, ini); len += fce_len; - fce.fce_v2_base.v2_direct = !link->lgr->uses_gateway; + fce_v2x.fce_v2_base.v2_direct = !link->lgr->uses_gateway; if (clc->hdr.type == SMC_CLC_CONFIRM) { memset(&gle, 0, sizeof(gle)); gle.gid_cnt = ini->smcrv2.gidlist.len; @@ -1111,7 +1111,7 @@ static int smc_clc_send_confirm_accept(struct smc_sock *smc, SMCR_CLC_ACCEPT_CONFIRM_LEN) - sizeof(trl); if (version > SMC_V1 && first_contact) { - vec[i].iov_base = &fce; + vec[i].iov_base = &fce_v2x; vec[i++].iov_len = fce_len; if (!conn->lgr->is_smcd) { if (clc->hdr.type == SMC_CLC_CONFIRM) { -- 1.8.3.1