diff options
| -rw-r--r-- | fs/ocfs2/cluster/heartbeat.c | 2 | ||||
| -rw-r--r-- | fs/ocfs2/dlm/dlmdomain.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index 29aee2128edb..6a1280a013ea 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c | |||
| @@ -2429,6 +2429,6 @@ EXPORT_SYMBOL_GPL(o2hb_get_all_regions); | |||
| 2429 | 2429 | ||
| 2430 | int o2hb_global_heartbeat_active(void) | 2430 | int o2hb_global_heartbeat_active(void) |
| 2431 | { | 2431 | { |
| 2432 | return 0; | 2432 | return (o2hb_heartbeat_mode == O2HB_HEARTBEAT_GLOBAL); |
| 2433 | } | 2433 | } |
| 2434 | EXPORT_SYMBOL(o2hb_global_heartbeat_active); | 2434 | EXPORT_SYMBOL(o2hb_global_heartbeat_active); |
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index 78d428f5e10e..58a93b953735 100644 --- a/fs/ocfs2/dlm/dlmdomain.c +++ b/fs/ocfs2/dlm/dlmdomain.c | |||
| @@ -135,7 +135,7 @@ static DECLARE_WAIT_QUEUE_HEAD(dlm_domain_events); | |||
| 135 | */ | 135 | */ |
| 136 | static const struct dlm_protocol_version dlm_protocol = { | 136 | static const struct dlm_protocol_version dlm_protocol = { |
| 137 | .pv_major = 1, | 137 | .pv_major = 1, |
| 138 | .pv_minor = 0, | 138 | .pv_minor = 1, |
| 139 | }; | 139 | }; |
| 140 | 140 | ||
| 141 | #define DLM_DOMAIN_BACKOFF_MS 200 | 141 | #define DLM_DOMAIN_BACKOFF_MS 200 |
