From nobody Fri Dec 19 04:00:48 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 6E293CDB47E for ; Fri, 13 Oct 2023 07:33:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229751AbjJMHdB (ORCPT ); Fri, 13 Oct 2023 03:33:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229441AbjJMHc7 (ORCPT ); Fri, 13 Oct 2023 03:32:59 -0400 Received: from jari.cn (unknown [218.92.28.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 292B4AD for ; Fri, 13 Oct 2023 00:32:58 -0700 (PDT) Received: from wangkailong$jari.cn ( [182.148.14.172] ) by ajax-webmail-localhost.localdomain (Coremail) ; Fri, 13 Oct 2023 15:30:59 +0800 (GMT+08:00) X-Originating-IP: [182.148.14.172] Date: Fri, 13 Oct 2023 15:30:59 +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 dlmmaster.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: <7a92ebb0.967.18b27f217c1.Coremail.wangkailong@jari.cn> X-Coremail-Locale: zh_CN X-CM-TRANSID: AQAAfwD3lD8z8ihl+t7BAA--.754W X-CM-SenderInfo: 5zdqwypdlo00nj6mt2flof0/1tbiAQADB2UnvzMAKgAHsm 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: switch and case should be at the same indent ERROR: "foo * bar" should be "foo *bar" ERROR: spaces required around that '=3D' (ctx:VxV) ERROR: open brace '{' following struct go on the same line ERROR: space required after that ',' (ctx:VxV) ERROR: spaces required around that '<' (ctx:VxV) Signed-off-by: KaiLong Wang --- fs/ocfs2/dlm/dlmmaster.c | 98 ++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index d610da8e2f24..d290715a0a3d 100644 --- a/fs/ocfs2/dlm/dlmmaster.c +++ b/fs/ocfs2/dlm/dlmmaster.c @@ -115,23 +115,23 @@ static int dlm_pre_master_reco_lockres(struct dlm_ctx= t *dlm, int dlm_is_host_down(int errno) { switch (errno) { - case -EBADF: - case -ECONNREFUSED: - case -ENOTCONN: - case -ECONNRESET: - case -EPIPE: - case -EHOSTDOWN: - case -EHOSTUNREACH: - case -ETIMEDOUT: - case -ECONNABORTED: - case -ENETDOWN: - case -ENETUNREACH: - case -ENETRESET: - case -ESHUTDOWN: - case -ENOPROTOOPT: - case -EINVAL: /* if returned from our tcp code, + case -EBADF: + case -ECONNREFUSED: + case -ENOTCONN: + case -ECONNRESET: + case -EPIPE: + case -EHOSTDOWN: + case -EHOSTUNREACH: + case -ETIMEDOUT: + case -ECONNABORTED: + case -ENETDOWN: + case -ENETUNREACH: + case -ENETRESET: + case -ESHUTDOWN: + case -ENOPROTOOPT: + case -EINVAL: /* if returned from our tcp code, this means there is no socket */ - return 1; + return 1; } return 0; } @@ -698,12 +698,12 @@ static void dlm_lockres_drop_inflight_worker(struct d= lm_ctxt *dlm, * to assert_master (or die). * */ -struct dlm_lock_resource * dlm_get_lock_resource(struct dlm_ctxt *dlm, +struct dlm_lock_resource *dlm_get_lock_resource(struct dlm_ctxt *dlm, const char *lockid, int namelen, int flags) { - struct dlm_lock_resource *tmpres=3DNULL, *res=3DNULL; + struct dlm_lock_resource *tmpres =3D NULL, *res =3D NULL; struct dlm_master_list_entry *mle =3D NULL; struct dlm_master_list_entry *alloc_mle =3D NULL; int blocked =3D 0; @@ -1144,16 +1144,14 @@ static int dlm_wait_for_lock_mastery(struct dlm_ctx= t *dlm, return ret; } =20 -struct dlm_bitmap_diff_iter -{ +struct dlm_bitmap_diff_iter { int curnode; unsigned long *orig_bm; unsigned long *cur_bm; unsigned long diff_bm[BITS_TO_LONGS(O2NM_MAX_NODES)]; }; =20 -enum dlm_node_state_change -{ +enum dlm_node_state_change { NODE_DOWN =3D -1, NODE_NO_CHANGE =3D 0, NODE_UP @@ -1308,7 +1306,7 @@ static int dlm_do_master_request(struct dlm_lock_reso= urce *res, { struct dlm_ctxt *dlm =3D mle->dlm; struct dlm_master_request request; - int ret, response=3D0, resend; + int ret, response =3D 0, resend; =20 memset(&request, 0, sizeof(request)); request.node_idx =3D dlm->node_num; @@ -1351,31 +1349,31 @@ static int dlm_do_master_request(struct dlm_lock_re= source *res, resend =3D 0; spin_lock(&mle->spinlock); switch (response) { - case DLM_MASTER_RESP_YES: - set_bit(to, mle->response_map); - mlog(0, "node %u is the master, response=3DYES\n", to); - mlog(0, "%s:%.*s: master node %u now knows I have a " - "reference\n", dlm->name, res->lockname.len, - res->lockname.name, to); - mle->master =3D to; - break; - case DLM_MASTER_RESP_NO: - mlog(0, "node %u not master, response=3DNO\n", to); - set_bit(to, mle->response_map); - break; - case DLM_MASTER_RESP_MAYBE: - mlog(0, "node %u not master, response=3DMAYBE\n", to); - set_bit(to, mle->response_map); - set_bit(to, mle->maybe_map); - break; - case DLM_MASTER_RESP_ERROR: - mlog(0, "node %u hit an error, resending\n", to); - resend =3D 1; - response =3D 0; - break; - default: - mlog(ML_ERROR, "bad response! %u\n", response); - BUG(); + case DLM_MASTER_RESP_YES: + set_bit(to, mle->response_map); + mlog(0, "node %u is the master, response=3DYES\n", to); + mlog(0, "%s:%.*s: master node %u now knows I have a " + "reference\n", dlm->name, res->lockname.len, + res->lockname.name, to); + mle->master =3D to; + break; + case DLM_MASTER_RESP_NO: + mlog(0, "node %u not master, response=3DNO\n", to); + set_bit(to, mle->response_map); + break; + case DLM_MASTER_RESP_MAYBE: + mlog(0, "node %u not master, response=3DMAYBE\n", to); + set_bit(to, mle->response_map); + set_bit(to, mle->maybe_map); + break; + case DLM_MASTER_RESP_ERROR: + mlog(0, "node %u hit an error, resending\n", to); + resend =3D 1; + response =3D 0; + break; + default: + mlog(ML_ERROR, "bad response! %u\n", response); + BUG(); } spin_unlock(&mle->spinlock); if (resend) { @@ -1699,7 +1697,7 @@ static int dlm_do_assert_master(struct dlm_ctxt *dlm, r =3D 0; } else if (r < 0) { /* ok, something horribly messed. kill thyself. */ - mlog(ML_ERROR,"during assert master of %.*s to %u, " + mlog(ML_ERROR, "during assert master of %.*s to %u, " "got %d.\n", namelen, lockname, to, r); spin_lock(&dlm->spinlock); spin_lock(&dlm->master_lock); @@ -2930,7 +2928,7 @@ static void dlm_remove_nonlocal_locks(struct dlm_ctxt= *dlm, =20 BUG_ON(res->owner =3D=3D dlm->node_num); =20 - for (i=3D0; i<3; i++) { + for (i =3D 0; i < 3; i++) { list_for_each_entry_safe(lock, next, queue, list) { if (lock->ml.node !=3D dlm->node_num) { mlog(0, "putting lock for node %u\n", --=20 2.17.1