diff options
author | Mark Fasheh <mark.fasheh@oracle.com> | 2007-09-24 18:09:41 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2008-01-25 17:36:40 -0500 |
commit | 6f7b056ea9c6fa978c79ca626eff43549df94dbb (patch) | |
tree | e8318b4f7390547ad84208c393608f7141c027d3 /fs/ocfs2/super.c | |
parent | 6561168cb442be8d2769dce663870b6a28573e16 (diff) |
ocfs2: Remove fs dependency on ocfs2_heartbeat module
Now that the dlm exposes domain information to us, we don't need generic
node up / node down callbacks. And since the DLM is only telling us when a
node goes down unexpectedly, we no longer need to optimize away node down
callbacks via the umount map.
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/super.c')
-rw-r--r-- | fs/ocfs2/super.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 5ee775420665..64b81b341ece 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
@@ -1117,12 +1117,6 @@ static int ocfs2_mount_volume(struct super_block *sb) | |||
1117 | goto leave; | 1117 | goto leave; |
1118 | } | 1118 | } |
1119 | 1119 | ||
1120 | status = ocfs2_register_hb_callbacks(osb); | ||
1121 | if (status < 0) { | ||
1122 | mlog_errno(status); | ||
1123 | goto leave; | ||
1124 | } | ||
1125 | |||
1126 | status = ocfs2_dlm_init(osb); | 1120 | status = ocfs2_dlm_init(osb); |
1127 | if (status < 0) { | 1121 | if (status < 0) { |
1128 | mlog_errno(status); | 1122 | mlog_errno(status); |
@@ -1260,8 +1254,6 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err) | |||
1260 | ocfs2_dlm_shutdown(osb); | 1254 | ocfs2_dlm_shutdown(osb); |
1261 | } | 1255 | } |
1262 | 1256 | ||
1263 | ocfs2_clear_hb_callbacks(osb); | ||
1264 | |||
1265 | debugfs_remove(osb->osb_debug_root); | 1257 | debugfs_remove(osb->osb_debug_root); |
1266 | 1258 | ||
1267 | if (!mnt_err) | 1259 | if (!mnt_err) |