The patch titled
Subject: fs: ocfs: fix spelling mistake "hearbeating" -> "heartbeat"
has been added to the -mm tree. Its filename is
fs-ocfs-fix-spelling-mistake-hearbeating-heartbeat.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/fs-ocfs-fix-spelling-mistake-hearbeating-heartbeat.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/fs-ocfs-fix-spelling-mistake-hearbeating-heartbeat.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: ChenGang <cg.chen@xxxxxxxxxx>
Subject: fs: ocfs: fix spelling mistake "hearbeating" -> "heartbeat"
There are some spelling mistakes in ocfs, fix it.
Link: http://lkml.kernel.org/r/1558964623-106628-1-git-send-email-cg.chen@xxxxxxxxxx
Signed-off-by: ChenGang <cg.chen@xxxxxxxxxx>
Cc: Mark Fasheh <mark@xxxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: Joseph Qi <jiangqi903@xxxxxxxxx>
Cc: Changwei Ge <gechangwei@xxxxxxx>
Cc: Gang He <ghe@xxxxxxxx>
Cc: Jun Piao <piaojun@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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(-)
--- a/fs/ocfs2/cluster/heartbeat.c~fs-ocfs-fix-spelling-mistake-hearbeating-heartbeat
+++ a/fs/ocfs2/cluster/heartbeat.c
@@ -1198,7 +1198,7 @@ bail:
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);
--- a/fs/ocfs2/cluster/quorum.c~fs-ocfs-fix-spelling-mistake-hearbeating-heartbeat
+++ a/fs/ocfs2/cluster/quorum.c
@@ -90,7 +90,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
--- a/fs/ocfs2/cluster/tcp.c~fs-ocfs-fix-spelling-mistake-hearbeating-heartbeat
+++ a/fs/ocfs2/cluster/tcp.c
@@ -1776,7 +1776,7 @@ static void o2net_hb_node_up_cb(struct o
(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 */
--- a/fs/ocfs2/dlm/dlmmaster.c~fs-ocfs-fix-spelling-mistake-hearbeating-heartbeat
+++ a/fs/ocfs2/dlm/dlmmaster.c
@@ -2176,7 +2176,7 @@ put:
* 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,
_
Patches currently in -mm which might be from cg.chen@xxxxxxxxxx are
fs-ocfs-fix-spelling-mistake-hearbeating-heartbeat.patch
