Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp4341581yba; Mon, 29 Apr 2019 18:34:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqyWRR+QDwdnOf28S7JeNIKfWqf9j12gpqhqMm7rg30zjFux5JyOzluSu/La8R2nzBdDdERx X-Received: by 2002:a65:644e:: with SMTP id s14mr10330022pgv.290.1556588073263; Mon, 29 Apr 2019 18:34:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556588073; cv=none; d=google.com; s=arc-20160816; b=BATy2lwbTpY4DDonr+s0/Iff3R1Xnrp/wuvv8VdTe4hLNSCQZL9Tp7uhauYo2TpQbQ kpPkdQUNTglRGmykc0pcdr1cmji0rYvgNi/eKxiX/Dip/9s++w7GSh4UyOri+4dxsH9Y 2e63baT713VpIrdnS6AzzbRfWVkyRwKK2DsZ9TUr0iu2z90OsBJyjwOkCWIsvTXE4QjR DPVTaCBRU0MnNO6T27nVLBJj2h1HwWhGumpzIhA/6tTula7yEg5+P+epJz+JSj3GAG2t 3ZRjjLL3LZ7XtVpzyV2DXESDxmEFi9ZImdZg1/pXJrFfWcEejW16pQTMJn+Q2/S+hN+t 0Ztw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=7WdbymHySTnzEf4GEXS66BJkovJQers17mJjgd2xU+w=; b=PlM6bkaZIyGnUEsGB5H2sBcZmqjUN9j6Ghvk8ieCgarAwhrvvVCf95Fq1LRnbVNl/B 0QNUdh8rpl3c7S73BuJb7EAL2FYd/eVrc3b0dYbTi5dxH3sUlGRLBldjY3mdIjW11AsC EyWE8yGLyO2rkcM1VdsoIQQiylg1/xiPUY+PnfwIIzL4sOWSgPgWbzcmebvcLZOMEfyu cOatiV5nElOmld/augYQhLVUI4VljtpfiwcmJxBec73YPCZS2u4MNVKXf8HoXAv2OlbO 3MvHpsl/UgPV30R7F0LyoAv6urekbBjBqtTOiUDowyxty07LB6F8ilneL7jnSON2oU/Y U09Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s189si19560739pgb.346.2019.04.29.18.34.17; Mon, 29 Apr 2019 18:34:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729836AbfD3Bbx (ORCPT + 99 others); Mon, 29 Apr 2019 21:31:53 -0400 Received: from out30-54.freemail.mail.aliyun.com ([115.124.30.54]:48640 "EHLO out30-54.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729626AbfD3Bbx (ORCPT ); Mon, 29 Apr 2019 21:31:53 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;DM=||false|;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e07487;MF=joseph.qi@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0TQafK3A_1556587909; Received: from JosephdeMacBook-Pro.local(mailfrom:joseph.qi@linux.alibaba.com fp:SMTPD_---0TQafK3A_1556587909) by smtp.aliyun-inc.com(127.0.0.1); Tue, 30 Apr 2019 09:31:50 +0800 Subject: Re: [PATCH] fs: ocfs: fix spelling mistake "hearbeating" -> "heartbeat" To: ChenGang , mark@fasheh.com, jlbec@evilplan.org, jiangqi903@gmail.com Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, ocfs2-devel@oss.oracle.com References: <1556541700-35237-1-git-send-email-cg.chen@huawei.com> From: Joseph Qi Message-ID: <27ff3446-8f17-6acc-808c-56f26a9d66e2@linux.alibaba.com> Date: Tue, 30 Apr 2019 09:31:49 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <1556541700-35237-1-git-send-email-cg.chen@huawei.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 19/4/29 20:41, ChenGang wrote: > Hi Joseph, > Thanks for your advice, and I folded the four patches into one. > Please resend an official version for conveniently track and then pick. Thanks. > On 19/4/28 20:22, Joseph Qi wrote: >> Hi ChenGang, >> Could you please fold these four patches into one? > >> Thanks, >> Joseph > >> On 19/4/27 20:22, ChenGang wrote: >>> There is a spelling mistake in o2hb_do_disk_heartbeat debug message.Fix it. >>> >>> Signed-off-by: ChenGang >>> --- >>> fs/ocfs2/cluster/heartbeat.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/fs/ocfs2/cluster/heartbeat.c >>> b/fs/ocfs2/cluster/heartbeat.c index f3c20b2..e4e7df1 100644 >>> --- a/fs/ocfs2/cluster/heartbeat.c >>> +++ b/fs/ocfs2/cluster/heartbeat.c >>> @@ -1198,7 +1198,7 @@ static int o2hb_do_disk_heartbeat(struct o2hb_region *reg) >>> if (atomic_read(®->hr_steady_iterations) != 0) { >>> if (atomic_dec_and_test(®->hr_unsteady_iterations)) { >>> printk(KERN_NOTICE "o2hb: Unable to stabilize " >>> - "heartbeart on region %s (%s)\n", >>> + "heartbeat on region %s (%s)\n", >>> config_item_name(®->hr_item), >>> reg->hr_dev_name); >>> atomic_set(®->hr_steady_iterations, 0); >>> > > > Signed-off-by: ChenGang > --- > fs/ocfs2/cluster/heartbeat.c | 2 +- > fs/ocfs2/cluster/quorum.c | 2 +- > fs/ocfs2/cluster/tcp.c | 2 +- > fs/ocfs2/dlm/dlmmaster.c | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c > index f3c20b2..e4e7df1 100644 > --- a/fs/ocfs2/cluster/heartbeat.c > +++ b/fs/ocfs2/cluster/heartbeat.c > @@ -1198,7 +1198,7 @@ static int o2hb_do_disk_heartbeat(struct o2hb_region *reg) > if (atomic_read(®->hr_steady_iterations) != 0) { > if (atomic_dec_and_test(®->hr_unsteady_iterations)) { > printk(KERN_NOTICE "o2hb: Unable to stabilize " > - "heartbeart on region %s (%s)\n", > + "heartbeat on region %s (%s)\n", > config_item_name(®->hr_item), > reg->hr_dev_name); > atomic_set(®->hr_steady_iterations, 0); > diff --git a/fs/ocfs2/cluster/quorum.c b/fs/ocfs2/cluster/quorum.c > index af2e747..792132f 100644 > --- a/fs/ocfs2/cluster/quorum.c > +++ b/fs/ocfs2/cluster/quorum.c > @@ -89,7 +89,7 @@ static void o2quo_fence_self(void) > }; > } > > -/* Indicate that a timeout occurred on a hearbeat region write. The > +/* Indicate that a timeout occurred on a heartbeat region write. The > * other nodes in the cluster may consider us dead at that time so we > * want to "fence" ourselves so that we don't scribble on the disk > * after they think they've recovered us. This can't solve all > diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c > index e9f236a..7a43c04 100644 > --- a/fs/ocfs2/cluster/tcp.c > +++ b/fs/ocfs2/cluster/tcp.c > @@ -1776,7 +1776,7 @@ static void o2net_hb_node_up_cb(struct o2nm_node *node, int node_num, > (msecs_to_jiffies(o2net_reconnect_delay()) + 1); > > if (node_num != o2nm_this_node()) { > - /* believe it or not, accept and node hearbeating testing > + /* believe it or not, accept and node heartbeating testing > * can succeed for this node before we got here.. so > * only use set_nn_state to clear the persistent error > * if that hasn't already happened */ > diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c > index 826f056..41b80d5 100644 > --- a/fs/ocfs2/dlm/dlmmaster.c > +++ b/fs/ocfs2/dlm/dlmmaster.c > @@ -2176,7 +2176,7 @@ static void dlm_assert_master_worker(struct dlm_work_item *item, void *data) > * think that $RECOVERY is currently mastered by a dead node. If so, > * we wait a short time to allow that node to get notified by its own > * heartbeat stack, then check again. All $RECOVERY lock resources > - * mastered by dead nodes are purged when the hearbeat callback is > + * mastered by dead nodes are purged when the heartbeat callback is > * fired, so we can know for sure that it is safe to continue once > * the node returns a live node or no node. */ > static int dlm_pre_master_reco_lockres(struct dlm_ctxt *dlm, >