From 16c6a4f24de2933b26477ad5dfb71f518220d641 Mon Sep 17 00:00:00 2001
From: Joel Becker <joel.becker@oracle.com>
Date: Tue, 19 Jun 2007 11:34:03 -0700
Subject: ocfs2: live heartbeat depends on the local node configuration
Removing the local node configuration out from underneath a running
heartbeat is "bad". Provide an API in the ocfs2 nodemanager to request
a configfs dependancy on the local node, then use it in heartbeat.
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
---
fs/ocfs2/cluster/heartbeat.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
(limited to 'fs/ocfs2/cluster/heartbeat.c')
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index e331f4cb2c8..2877d468f11 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -1693,9 +1693,18 @@ static int o2hb_region_get(const char *region_uuid)
ret = -ENOENT;
spin_unlock(&o2hb_live_lock);
- if (!ret)
- ret = o2nm_depend_item(®->hr_item);
+ if (ret)
+ goto out;
+
+ ret = o2nm_depend_this_node();
+ if (ret)
+ goto out;
+ ret = o2nm_depend_item(®->hr_item);
+ if (ret)
+ o2nm_undepend_this_node();
+
+out:
return ret;
}
@@ -1709,8 +1718,10 @@ static void o2hb_region_put(const char *region_uuid)
spin_unlock(&o2hb_live_lock);
- if (reg)
+ if (reg) {
o2nm_undepend_item(®->hr_item);
+ o2nm_undepend_this_node();
+ }
}
int o2hb_register_callback(const char *region_uuid,
--
cgit v1.2.3