aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/ocfs2.h
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/ocfs2.h')
-rw-r--r--fs/ocfs2/ocfs2.h25
1 files changed, 5 insertions, 20 deletions
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
index 60a23e1906b0..f8f866144c6a 100644
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
@@ -189,9 +189,7 @@ struct ocfs2_super
189 struct ocfs2_slot_info *slot_info; 189 struct ocfs2_slot_info *slot_info;
190 190
191 spinlock_t node_map_lock; 191 spinlock_t node_map_lock;
192 struct ocfs2_node_map mounted_map;
193 struct ocfs2_node_map recovery_map; 192 struct ocfs2_node_map recovery_map;
194 struct ocfs2_node_map umount_map;
195 193
196 u64 root_blkno; 194 u64 root_blkno;
197 u64 system_dir_blkno; 195 u64 system_dir_blkno;
@@ -254,28 +252,15 @@ struct ocfs2_super
254 252
255 wait_queue_head_t recovery_event; 253 wait_queue_head_t recovery_event;
256 254
257 spinlock_t vote_task_lock; 255 spinlock_t dc_task_lock;
258 struct task_struct *vote_task; 256 struct task_struct *dc_task;
259 wait_queue_head_t vote_event; 257 wait_queue_head_t dc_event;
260 unsigned long vote_wake_sequence; 258 unsigned long dc_wake_sequence;
261 unsigned long vote_work_sequence; 259 unsigned long dc_work_sequence;
262 260
263 struct list_head blocked_lock_list; 261 struct list_head blocked_lock_list;
264 unsigned long blocked_lock_count; 262 unsigned long blocked_lock_count;
265 263
266 struct list_head vote_list;
267 int vote_count;
268
269 u32 net_key;
270 spinlock_t net_response_lock;
271 unsigned int net_response_ids;
272 struct list_head net_response_list;
273
274 struct o2hb_callback_func osb_hb_up;
275 struct o2hb_callback_func osb_hb_down;
276
277 struct list_head osb_net_handlers;
278
279 wait_queue_head_t osb_mount_event; 264 wait_queue_head_t osb_mount_event;
280 265
281 /* Truncate log info */ 266 /* Truncate log info */