diff options
author | Mark Fasheh <mark.fasheh@oracle.com> | 2006-05-04 15:03:26 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-06-29 19:10:13 -0400 |
commit | 784270435b001164054e803421a624ef1098519d (patch) | |
tree | f26fec7ca476439f770fd24e5c7ec11039302b37 /fs/ocfs2/ocfs2.h | |
parent | a75a6e4c3ada10b15e26f6d12f72c03efde266e0 (diff) |
ocfs2: clean up some osb fields
Get rid of osb->uuid, osb->proc_sub_dir, and osb->osb_id. Those fields were
unused, or could easily be removed. As a result, we also no longer need
MAX_OSB_ID or ocfs2_globals_lock.
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/ocfs2.h')
-rw-r--r-- | fs/ocfs2/ocfs2.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h index da1093039c01..cd4a6f253d13 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h | |||
@@ -184,7 +184,6 @@ struct ocfs2_journal; | |||
184 | struct ocfs2_journal_handle; | 184 | struct ocfs2_journal_handle; |
185 | struct ocfs2_super | 185 | struct ocfs2_super |
186 | { | 186 | { |
187 | u32 osb_id; /* id used by the proc interface */ | ||
188 | struct task_struct *commit_task; | 187 | struct task_struct *commit_task; |
189 | struct super_block *sb; | 188 | struct super_block *sb; |
190 | struct inode *root_inode; | 189 | struct inode *root_inode; |
@@ -222,13 +221,11 @@ struct ocfs2_super | |||
222 | unsigned long s_mount_opt; | 221 | unsigned long s_mount_opt; |
223 | 222 | ||
224 | u16 max_slots; | 223 | u16 max_slots; |
225 | u16 num_nodes; | ||
226 | s16 node_num; | 224 | s16 node_num; |
227 | s16 slot_num; | 225 | s16 slot_num; |
228 | int s_sectsize_bits; | 226 | int s_sectsize_bits; |
229 | int s_clustersize; | 227 | int s_clustersize; |
230 | int s_clustersize_bits; | 228 | int s_clustersize_bits; |
231 | struct proc_dir_entry *proc_sub_dir; /* points to /proc/fs/ocfs2/<maj_min> */ | ||
232 | 229 | ||
233 | atomic_t vol_state; | 230 | atomic_t vol_state; |
234 | struct mutex recovery_lock; | 231 | struct mutex recovery_lock; |
@@ -294,7 +291,6 @@ struct ocfs2_super | |||
294 | }; | 291 | }; |
295 | 292 | ||
296 | #define OCFS2_SB(sb) ((struct ocfs2_super *)(sb)->s_fs_info) | 293 | #define OCFS2_SB(sb) ((struct ocfs2_super *)(sb)->s_fs_info) |
297 | #define OCFS2_MAX_OSB_ID 65536 | ||
298 | 294 | ||
299 | static inline int ocfs2_should_order_data(struct inode *inode) | 295 | static inline int ocfs2_should_order_data(struct inode *inode) |
300 | { | 296 | { |