p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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@huawei.com
Signed-off-by: ChenGang <cg.chen@huawei.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Joseph Qi <jiangqi903@gmail.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
ChenGang 2019-07-11 20:52:55 -07:00 committed by Linus Torvalds
parent 733f0025f0
commit e926d8a1e8
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ocfs2/cluster/heartbeat.c
View File

@ -1184,7 +1184,7 @@ static int o2hb_do_disk_heartbeat(struct o2hb_region *reg)
if (atomic_read(&reg->hr_steady_iterations) != 0) { if (atomic_read(&reg->hr_steady_iterations) != 0) {
if (atomic_dec_and_test(&reg->hr_unsteady_iterations)) { if (atomic_dec_and_test(&reg->hr_unsteady_iterations)) {
printk(KERN_NOTICE "o2hb: Unable to stabilize " printk(KERN_NOTICE "o2hb: Unable to stabilize "
"heartbeart on region %s (%s)\n", "heartbeat on region %s (%s)\n",
config_item_name(&reg->hr_item), config_item_name(&reg->hr_item),
reg->hr_dev_name); reg->hr_dev_name);
atomic_set(&reg->hr_steady_iterations, 0); atomic_set(&reg->hr_steady_iterations, 0);

2
fs/ocfs2/cluster/quorum.c
View File

@ -76,7 +76,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 * 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 * 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 * after they think they've recovered us. This can't solve all

2
fs/ocfs2/cluster/tcp.c
View File

@ -1762,7 +1762,7 @@ static void o2net_hb_node_up_cb(struct o2nm_node *node, int node_num,
(msecs_to_jiffies(o2net_reconnect_delay()) + 1); (msecs_to_jiffies(o2net_reconnect_delay()) + 1);
if (node_num != o2nm_this_node()) { 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 * can succeed for this node before we got here.. so
* only use set_nn_state to clear the persistent error * only use set_nn_state to clear the persistent error
* if that hasn't already happened */ * if that hasn't already happened */

2
fs/ocfs2/dlm/dlmmaster.c
View File

@ -2161,7 +2161,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, * 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 * we wait a short time to allow that node to get notified by its own
* heartbeat stack, then check again. All $RECOVERY lock resources * 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 * fired, so we can know for sure that it is safe to continue once
* the node returns a live node or no node. */ * the node returns a live node or no node. */
static int dlm_pre_master_reco_lockres(struct dlm_ctxt *dlm, static int dlm_pre_master_reco_lockres(struct dlm_ctxt *dlm,