ocfs2: Remove fs dependency on ocfs2_heartbeat module

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / super.c

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 5ee7754206651baceff8735e57b4b7382e2617e9..64b81b341eceedeb3eb487c676685c3a3f95f236 100644 (file)
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1117,12 +1117,6 @@ static int ocfs2_mount_volume(struct super_block *sb)
                goto leave;
        }
 
-       status = ocfs2_register_hb_callbacks(osb);
-       if (status < 0) {
-               mlog_errno(status);
-               goto leave;
-       }
-
        status = ocfs2_dlm_init(osb);
        if (status < 0) {
                mlog_errno(status);
@@ -1260,8 +1254,6 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err)
                ocfs2_dlm_shutdown(osb);
        }
 
-       ocfs2_clear_hb_callbacks(osb);
-
        debugfs_remove(osb->osb_debug_root);
 
        if (!mnt_err)