fs: ocfs: fix spelling mistake "hearbeating" -> "heartbeat"
Subsystems (2)
Hi Joseph,
Thanks for your advice, and I folded the four patches into one.
Quoted 14 lines · Joseph Qi
Hi ChenGang,
Could you please fold these four patches into one?Thanks,
JosephQuoted 7 lines · ChenGang
There is a spelling mistake in
o2hb_do_disk_heartbeatdebug message.Fix it.Signed-off-by ChenGang <[email protected]>--- fs/ocfs2/cluster/heartbeat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 14 lines
Quoted 6 lines
(quoted diff) +0
-0
b/fs/ocfs2/cluster/heartbeat.cindex f3c20b2..e4e7df1 100644fs/ocfs2/cluster/heartbeat.c static int o2hb_do_disk_heartbeat(struct o2hb_region *reg) · line 1204
Quoted 8 lines
fs/ocfs2/cluster/heartbeat.c +1
-1@@ -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 );
--- 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(-)
fs/ocfs2/cluster/heartbeat.c +1 -1
@@ -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 );
fs/ocfs2/cluster/quorum.c +1 -1
@@ -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
fs/ocfs2/cluster/tcp.c +1 -1
@@ -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 */
fs/ocfs2/dlm/dlmmaster.c +1 -1
@@ -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,
Signature · 1 line
1.8.5.6
Joseph Qi
maintainerQuoted 3 lines · ChenGang
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.
Quoted 92 lines · Joseph Qi
Quoted 14 lines
Hi ChenGang,
Could you please fold these four patches into one?Thanks,
JosephQuoted 7 lines · ChenGang
There is a spelling mistake in
o2hb_do_disk_heartbeatdebug message.Fix it.Signed-off-by ChenGang <[email protected]>--- fs/ocfs2/cluster/heartbeat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 14 lines
Quoted 6 lines
(quoted diff) +0
-0
b/fs/ocfs2/cluster/heartbeat.cindex f3c20b2..e4e7df1 100644fs/ocfs2/cluster/heartbeat.c static int o2hb_do_disk_heartbeat(struct o2hb_region *reg) · line 1204
Quoted 8 lines
fs/ocfs2/cluster/heartbeat.c +1
-1@@ -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 <[email protected]>--- 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(-)fs/ocfs2/cluster/heartbeat.c +1
-1@@ -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 );fs/ocfs2/cluster/quorum.c +1
-1@@ -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 fs/ocfs2/cluster/tcp.c +1
-1@@ -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 */ fs/ocfs2/dlm/dlmmaster.c +1
-1@@ -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,