diff options
Diffstat (limited to 'fs/ocfs2/heartbeat.c')
-rw-r--r-- | fs/ocfs2/heartbeat.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/ocfs2/heartbeat.c b/fs/ocfs2/heartbeat.c index 6239fc52790c..c0efd9489fe8 100644 --- a/fs/ocfs2/heartbeat.c +++ b/fs/ocfs2/heartbeat.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include "heartbeat.h" | 41 | #include "heartbeat.h" |
42 | #include "inode.h" | 42 | #include "inode.h" |
43 | #include "journal.h" | 43 | #include "journal.h" |
44 | #include "vote.h" | ||
45 | 44 | ||
46 | #include "buffer_head_io.h" | 45 | #include "buffer_head_io.h" |
47 | 46 | ||
@@ -58,9 +57,7 @@ static void __ocfs2_node_map_set(struct ocfs2_node_map *target, | |||
58 | void ocfs2_init_node_maps(struct ocfs2_super *osb) | 57 | void ocfs2_init_node_maps(struct ocfs2_super *osb) |
59 | { | 58 | { |
60 | spin_lock_init(&osb->node_map_lock); | 59 | spin_lock_init(&osb->node_map_lock); |
61 | ocfs2_node_map_init(&osb->mounted_map); | ||
62 | ocfs2_node_map_init(&osb->recovery_map); | 60 | ocfs2_node_map_init(&osb->recovery_map); |
63 | ocfs2_node_map_init(&osb->umount_map); | ||
64 | ocfs2_node_map_init(&osb->osb_recovering_orphan_dirs); | 61 | ocfs2_node_map_init(&osb->osb_recovering_orphan_dirs); |
65 | } | 62 | } |
66 | 63 | ||
@@ -82,8 +79,6 @@ static void ocfs2_do_node_down(int node_num, | |||
82 | } | 79 | } |
83 | 80 | ||
84 | ocfs2_recovery_thread(osb, node_num); | 81 | ocfs2_recovery_thread(osb, node_num); |
85 | |||
86 | ocfs2_remove_node_from_vote_queues(osb, node_num); | ||
87 | } | 82 | } |
88 | 83 | ||
89 | /* Called from the dlm when it's about to evict a node. We may also | 84 | /* Called from the dlm when it's about to evict a node. We may also |
@@ -268,8 +263,6 @@ int ocfs2_recovery_map_set(struct ocfs2_super *osb, | |||
268 | 263 | ||
269 | spin_lock(&osb->node_map_lock); | 264 | spin_lock(&osb->node_map_lock); |
270 | 265 | ||
271 | __ocfs2_node_map_clear_bit(&osb->mounted_map, num); | ||
272 | |||
273 | if (!test_bit(num, osb->recovery_map.map)) { | 266 | if (!test_bit(num, osb->recovery_map.map)) { |
274 | __ocfs2_node_map_set_bit(&osb->recovery_map, num); | 267 | __ocfs2_node_map_set_bit(&osb->recovery_map, num); |
275 | set = 1; | 268 | set = 1; |