fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / ocfs2 / heartbeat.c

diff --git a/fs/ocfs2/heartbeat.c b/fs/ocfs2/heartbeat.c
index cbfd45a..8fc52d6 100644 (file)
--- a/fs/ocfs2/heartbeat.c
+++ b/fs/ocfs2/heartbeat.c
@@ -154,6 +154,9 @@ int ocfs2_register_hb_callbacks(struct ocfs2_super *osb)
 {
        int status;
 
+       if (ocfs2_mount_local(osb))
+               return 0;
+
        status = o2hb_register_callback(&osb->osb_hb_down);
        if (status < 0) {
                mlog_errno(status);
@@ -172,6 +175,9 @@ void ocfs2_clear_hb_callbacks(struct ocfs2_super *osb)
 {
        int status;
 
+       if (ocfs2_mount_local(osb))
+               return;
+
        status = o2hb_unregister_callback(&osb->osb_hb_down);
        if (status < 0)
                mlog_errno(status);
@@ -186,6 +192,9 @@ void ocfs2_stop_heartbeat(struct ocfs2_super *osb)
        int ret;
        char *argv[5], *envp[3];
 
+       if (ocfs2_mount_local(osb))
+               return;
+
        if (!osb->uuid_str) {
                /* This can happen if we don't get far enough in mount... */
                mlog(0, "No UUID with which to stop heartbeat!\n\n");