Browse Source

ocfs2/cluster: Bump up dlm protocol to version 1.1

dlm protocol 1.1. activates messages DLM_QUERY_REGION and DLM_QUERY_NODEINFO
that are a must for global heartbeat.

It also activates o2hb_global_heartbeat_active().

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Sunil Mushran 15 years ago
parent
commit
4d94aa1b1d
2 changed files with 2 additions and 2 deletions
  1. 1 1
      fs/ocfs2/cluster/heartbeat.c
  2. 1 1
      fs/ocfs2/dlm/dlmdomain.c

+ 1 - 1
fs/ocfs2/cluster/heartbeat.c

@@ -2429,6 +2429,6 @@ EXPORT_SYMBOL_GPL(o2hb_get_all_regions);
 
 
 int o2hb_global_heartbeat_active(void)
 int o2hb_global_heartbeat_active(void)
 {
 {
-	return 0;
+	return (o2hb_heartbeat_mode == O2HB_HEARTBEAT_GLOBAL);
 }
 }
 EXPORT_SYMBOL(o2hb_global_heartbeat_active);
 EXPORT_SYMBOL(o2hb_global_heartbeat_active);

+ 1 - 1
fs/ocfs2/dlm/dlmdomain.c

@@ -135,7 +135,7 @@ static DECLARE_WAIT_QUEUE_HEAD(dlm_domain_events);
  */
  */
 static const struct dlm_protocol_version dlm_protocol = {
 static const struct dlm_protocol_version dlm_protocol = {
 	.pv_major = 1,
 	.pv_major = 1,
-	.pv_minor = 0,
+	.pv_minor = 1,
 };
 };
 
 
 #define DLM_DOMAIN_BACKOFF_MS 200
 #define DLM_DOMAIN_BACKOFF_MS 200