1 files changed, 14 insertions, 5 deletions

diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 42252bf64b51..5c1c864e81cc 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -176,7 +176,7 @@ static void o2hb_dead_threshold_set(unsigned int threshold)
         }
 }
 
-static int o2hb_global_hearbeat_mode_set(unsigned int hb_mode)
+static int o2hb_global_heartbeat_mode_set(unsigned int hb_mode)
 {
         int ret = -1;
 
@@ -500,7 +500,7 @@ static int o2hb_issue_node_write(struct o2hb_region *reg,
         }
 
         atomic_inc(&write_wc->wc_num_reqs);
-        submit_bio(WRITE, bio);
+        submit_bio(WRITE_SYNC, bio);
 
         status = 0;
 bail:
@@ -2271,7 +2271,7 @@ ssize_t o2hb_heartbeat_group_mode_store(struct o2hb_heartbeat_group *group,
                 if (strnicmp(page, o2hb_heartbeat_mode_desc[i], len))
                         continue;
 
-                ret = o2hb_global_hearbeat_mode_set(i);
+                ret = o2hb_global_heartbeat_mode_set(i);
                 if (!ret)
                         printk(KERN_NOTICE "o2hb: Heartbeat mode set to %s\n",
                                o2hb_heartbeat_mode_desc[i]);
@@ -2304,7 +2304,7 @@ static struct configfs_attribute *o2hb_heartbeat_group_attrs[] = {
         NULL,
 };
 
-static struct configfs_item_operations o2hb_hearbeat_group_item_ops = {
+static struct configfs_item_operations o2hb_heartbeat_group_item_ops = {
         .show_attribute         = o2hb_heartbeat_group_show,
         .store_attribute        = o2hb_heartbeat_group_store,
 };
@@ -2316,7 +2316,7 @@ static struct configfs_group_operations o2hb_heartbeat_group_group_ops = {
 
 static struct config_item_type o2hb_heartbeat_group_type = {
         .ct_group_ops   = &o2hb_heartbeat_group_group_ops,
-        .ct_item_ops    = &o2hb_hearbeat_group_item_ops,
+        .ct_item_ops    = &o2hb_heartbeat_group_item_ops,
         .ct_attrs       = o2hb_heartbeat_group_attrs,
         .ct_owner       = THIS_MODULE,
 };
@@ -2389,6 +2389,9 @@ static int o2hb_region_pin(const char *region_uuid)
         assert_spin_locked(&o2hb_live_lock);
 
         list_for_each_entry(reg, &o2hb_all_regions, hr_all_item) {
+                if (reg->hr_item_dropped)
+                        continue;
+
                 uuid = config_item_name(&reg->hr_item);
 
                 /* local heartbeat */
@@ -2439,6 +2442,9 @@ static void o2hb_region_unpin(const char *region_uuid)
         assert_spin_locked(&o2hb_live_lock);
 
         list_for_each_entry(reg, &o2hb_all_regions, hr_all_item) {
+                if (reg->hr_item_dropped)
+                        continue;
+
                 uuid = config_item_name(&reg->hr_item);
                 if (region_uuid) {
                         if (strcmp(region_uuid, uuid))
@@ -2654,6 +2660,9 @@ int o2hb_get_all_regions(char *region_uuids, u8 max_regions)
 
         p = region_uuids;
         list_for_each_entry(reg, &o2hb_all_regions, hr_all_item) {
+                if (reg->hr_item_dropped)
+                        continue;
+
                 mlog(0, "Region: %s\n", config_item_name(&reg->hr_item));
                 if (numregs < max_regions) {
                         memcpy(p, config_item_name(&reg->hr_item),