git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
ocfs2
/
ocfs2.h
diff --git
a/fs/ocfs2/ocfs2.h
b/fs/ocfs2/ocfs2.h
index
da10930
..
0462a7f
100644
(file)
--- a/
fs/ocfs2/ocfs2.h
+++ b/
fs/ocfs2/ocfs2.h
@@
-184,7
+184,6
@@
struct ocfs2_journal;
struct ocfs2_journal_handle;
struct ocfs2_super
{
struct ocfs2_journal_handle;
struct ocfs2_super
{
- u32 osb_id; /* id used by the proc interface */
struct task_struct *commit_task;
struct super_block *sb;
struct inode *root_inode;
struct task_struct *commit_task;
struct super_block *sb;
struct inode *root_inode;
@@
-198,7
+197,6
@@
struct ocfs2_super
struct ocfs2_node_map recovery_map;
struct ocfs2_node_map umount_map;
struct ocfs2_node_map recovery_map;
struct ocfs2_node_map umount_map;
- u32 num_clusters;
u64 root_blkno;
u64 system_dir_blkno;
u64 bitmap_blkno;
u64 root_blkno;
u64 system_dir_blkno;
u64 bitmap_blkno;
@@
-222,13
+220,11
@@
struct ocfs2_super
unsigned long s_mount_opt;
u16 max_slots;
unsigned long s_mount_opt;
u16 max_slots;
- u16 num_nodes;
s16 node_num;
s16 slot_num;
int s_sectsize_bits;
int s_clustersize;
int s_clustersize_bits;
s16 node_num;
s16 slot_num;
int s_sectsize_bits;
int s_clustersize;
int s_clustersize_bits;
- struct proc_dir_entry *proc_sub_dir; /* points to /proc/fs/ocfs2/<maj_min> */
atomic_t vol_state;
struct mutex recovery_lock;
atomic_t vol_state;
struct mutex recovery_lock;
@@
-240,6
+236,7
@@
struct ocfs2_super
enum ocfs2_local_alloc_state local_alloc_state;
struct buffer_head *local_alloc_bh;
enum ocfs2_local_alloc_state local_alloc_state;
struct buffer_head *local_alloc_bh;
+ u64 la_last_gd;
/* Next two fields are for local node slot recovery during
* mount. */
/* Next two fields are for local node slot recovery during
* mount. */
@@
-294,7
+291,6
@@
struct ocfs2_super
};
#define OCFS2_SB(sb) ((struct ocfs2_super *)(sb)->s_fs_info)
};
#define OCFS2_SB(sb) ((struct ocfs2_super *)(sb)->s_fs_info)
-#define OCFS2_MAX_OSB_ID 65536
static inline int ocfs2_should_order_data(struct inode *inode)
{
static inline int ocfs2_should_order_data(struct inode *inode)
{