From nobody Fri Dec 19 04:01:23 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 981E5CDB483 for ; Fri, 13 Oct 2023 07:41:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229945AbjJMHl1 (ORCPT ); Fri, 13 Oct 2023 03:41:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229688AbjJMHlX (ORCPT ); Fri, 13 Oct 2023 03:41:23 -0400 Received: from jari.cn (unknown [218.92.28.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 12EB783 for ; Fri, 13 Oct 2023 00:41:19 -0700 (PDT) Received: from wangkailong$jari.cn ( [182.148.14.172] ) by ajax-webmail-localhost.localdomain (Coremail) ; Fri, 13 Oct 2023 15:39:32 +0800 (GMT+08:00) X-Originating-IP: [182.148.14.172] Date: Fri, 13 Oct 2023 15:39:32 +0800 (GMT+08:00) X-CM-HeaderCharset: UTF-8 From: "KaiLong Wang" To: mark@fasheh.com, jlbec@evilplan.org, akpm@linux-foundation.org Cc: ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] ocfs2/dlm: Clean up errors in dlmdomain.c X-Priority: 3 X-Mailer: Coremail Webmail Server Version 2023.1-cmXT6 build 20230419(ff23bf83) Copyright (c) 2002-2023 www.mailtech.cn mispb-4e503810-ca60-4ec8-a188-7102c18937cf-zhkzyfz.cn Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Message-ID: <62e91e34.969.18b27f9ec40.Coremail.wangkailong@jari.cn> X-Coremail-Locale: zh_CN X-CM-TRANSID: AQAAfwD3lD809ChlLd_BAA--.756W X-CM-SenderInfo: 5zdqwypdlo00nj6mt2flof0/1tbiAQADB2UnvzMAKwACsi X-Coremail-Antispam: 1Ur529EdanIXcx71UUUUU7IcSsGvfJ3iIAIbVAYjsxI4VWxJw CS07vEb4IE77IF4wCS07vE1I0E4x80FVAKz4kxMIAIbVAFxVCaYxvI4VCIwcAKzIAtYxBI daVFxhVjvjDU= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Fix the following errors reported by checkpatch: ERROR: "foo * bar" should be "foo *bar" ERROR: spaces required around that '=3D' (ctx:VxV) ERROR: spaces required around that '=3D=3D' (ctx:VxV) ERROR: do not use assignment in if condition Signed-off-by: KaiLong Wang --- fs/ocfs2/dlm/dlmdomain.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index 5c04dde99981..a9955eb97625 100644 --- a/fs/ocfs2/dlm/dlmdomain.c +++ b/fs/ocfs2/dlm/dlmdomain.c @@ -76,7 +76,8 @@ static void **dlm_alloc_pagevec(int pages) return NULL; =20 for (i =3D 0; i < pages; i++) - if (!(vec[i] =3D (void *)__get_free_page(GFP_KERNEL))) + vec[i] =3D (void *)__get_free_page(GFP_KERNEL); + if (!(vec[i])) goto out_free; =20 mlog(0, "Allocated DLM hash pagevec; %d pages (%lu expected), %lu buckets= per page\n", @@ -170,7 +171,7 @@ void __dlm_insert_lockres(struct dlm_ctxt *dlm, struct = dlm_lock_resource *res) res->lockname.name); } =20 -struct dlm_lock_resource * __dlm_lookup_lockres_full(struct dlm_ctxt *dlm, +struct dlm_lock_resource *__dlm_lookup_lockres_full(struct dlm_ctxt *dlm, const char *name, unsigned int len, unsigned int hash) @@ -203,7 +204,7 @@ struct dlm_lock_resource * __dlm_lookup_lockres_full(st= ruct dlm_ctxt *dlm, * currently in the process of dropping its mastery reference. * use __dlm_lookup_lockres_full when you need the lock resource * regardless (e.g. dlm_get_lock_resource) */ -struct dlm_lock_resource * __dlm_lookup_lockres(struct dlm_ctxt *dlm, +struct dlm_lock_resource *__dlm_lookup_lockres(struct dlm_ctxt *dlm, const char *name, unsigned int len, unsigned int hash) @@ -228,7 +229,7 @@ struct dlm_lock_resource * __dlm_lookup_lockres(struct = dlm_ctxt *dlm, return res; } =20 -struct dlm_lock_resource * dlm_lookup_lockres(struct dlm_ctxt *dlm, +struct dlm_lock_resource *dlm_lookup_lockres(struct dlm_ctxt *dlm, const char *name, unsigned int len) { @@ -241,7 +242,7 @@ struct dlm_lock_resource * dlm_lookup_lockres(struct dl= m_ctxt *dlm, return res; } =20 -static struct dlm_ctxt * __dlm_lookup_domain_full(const char *domain, int = len) +static struct dlm_ctxt *__dlm_lookup_domain_full(const char *domain, int l= en) { struct dlm_ctxt *tmp; =20 @@ -251,7 +252,7 @@ static struct dlm_ctxt * __dlm_lookup_domain_full(const= char *domain, int len) * but domain may not be! */ list_for_each_entry(tmp, &dlm_domains, list) { if (strlen(tmp->name) =3D=3D len && - memcmp(tmp->name, domain, len)=3D=3D0) + memcmp(tmp->name, domain, len) =3D=3D 0) return tmp; } =20 @@ -259,7 +260,7 @@ static struct dlm_ctxt * __dlm_lookup_domain_full(const= char *domain, int len) } =20 /* For null terminated domain strings ONLY */ -static struct dlm_ctxt * __dlm_lookup_domain(const char *domain) +static struct dlm_ctxt *__dlm_lookup_domain(const char *domain) { assert_spin_locked(&dlm_domain_lock); =20 @@ -827,7 +828,7 @@ static int dlm_query_join_handler(struct o2net_msg *msg= , u32 len, void *data, * node(s) that just left but still part of the cluster. DISALLOW * join request if joining node has different node map. */ - nodenum=3D0; + nodenum =3D 0; while (nodenum < O2NM_MAX_NODES) { if (test_bit(nodenum, dlm->domain_map)) { if (!byte_test_bit(nodenum, query->node_map)) { @@ -2095,7 +2096,7 @@ static int dlm_protocol_compare(struct dlm_protocol_v= ersion *existing, * If registration was successful, proto will contain the negotiated * locking protocol. */ -struct dlm_ctxt * dlm_register_domain(const char *domain, +struct dlm_ctxt *dlm_register_domain(const char *domain, u32 key, struct dlm_protocol_version *fs_proto) { --=20 2.17.1