1 files changed, 54 insertions, 1 deletions
diff --git a/include/linux/ext4_fs_sb.h b/include/linux/ext4_fs_sb.h
index b40e827cd495..abaae2c8cccf 100644
--- a/include/linux/ext4_fs_sb.h
+++ b/include/linux/ext4_fs_sb.h
@@ -35,9 +35,10 @@ struct ext4_sb_info {
        unsigned long s_itb_per_group;  /* Number of inode table blocks per group */
        unsigned long s_gdb_count;      /* Number of group descriptor blocks */
        unsigned long s_desc_per_block; /* Number of group descriptors per block */
-        unsigned long s_groups_count;   /* Number of groups in the fs */
+        ext4_group_t s_groups_count;    /* Number of groups in the fs */
        unsigned long s_overhead_last;  /* Last calculated overhead */
        unsigned long s_blocks_last;    /* Last seen block count */
+        loff_t s_bitmap_maxbytes;       /* max bytes for bitmap files */
        struct buffer_head * s_sbh;     /* Buffer containing the super block */
        struct ext4_super_block * s_es; /* Pointer to the super block in the buffer */
        struct buffer_head ** s_group_desc;
@@ -90,6 +91,58 @@ struct ext4_sb_info {
        unsigned long s_ext_blocks;
        unsigned long s_ext_extents;
 #endif
+        /* for buddy allocator */
+        struct ext4_group_info ***s_group_info;
+        struct inode *s_buddy_cache;
+        long s_blocks_reserved;
+        spinlock_t s_reserve_lock;
+        struct list_head s_active_transaction;
+        struct list_head s_closed_transaction;
+        struct list_head s_committed_transaction;
+        spinlock_t s_md_lock;
+        tid_t s_last_transaction;
+        unsigned short *s_mb_offsets, *s_mb_maxs;
+        /* tunables */
+        unsigned long s_stripe;
+        unsigned long s_mb_stream_request;
+        unsigned long s_mb_max_to_scan;
+        unsigned long s_mb_min_to_scan;
+        unsigned long s_mb_stats;
+        unsigned long s_mb_order2_reqs;
+        unsigned long s_mb_group_prealloc;
+        /* where last allocation was done - for stream allocation */
+        unsigned long s_mb_last_group;
+        unsigned long s_mb_last_start;
+        /* history to debug policy */
+        struct ext4_mb_history *s_mb_history;
+        int s_mb_history_cur;
+        int s_mb_history_max;
+        int s_mb_history_num;
+        struct proc_dir_entry *s_mb_proc;
+        spinlock_t s_mb_history_lock;
+        int s_mb_history_filter;
+        /* stats for buddy allocator */
+        spinlock_t s_mb_pa_lock;
+        atomic_t s_bal_reqs;    /* number of reqs with len > 1 */
+        atomic_t s_bal_success; /* we found long enough chunks */
+        atomic_t s_bal_allocated;       /* in blocks */
+        atomic_t s_bal_ex_scanned;      /* total extents scanned */
+        atomic_t s_bal_goals;   /* goal hits */
+        atomic_t s_bal_breaks;  /* too long searches */
+        atomic_t s_bal_2orders; /* 2^order hits */
+        spinlock_t s_bal_lock;
+        unsigned long s_mb_buddies_generated;
+        unsigned long long s_mb_generation_time;
+        atomic_t s_mb_lost_chunks;
+        atomic_t s_mb_preallocated;
+        atomic_t s_mb_discarded;
+        /* locality groups */
+        struct ext4_locality_group *s_locality_groups;
 };
 #endif  /* _LINUX_EXT4_FS_SB */

diff --git a/include/linux/ext4_fs_sb.h b/include/linux/ext4_fs_sb.h index b40e827cd495..abaae2c8cccf 100644 --- a/include/linux/ext4_fs_sb.h +++ b/include/linux/ext4_fs_sb.h
@@ -35,9 +35,10 @@ struct ext4_sb_info {
35	unsigned long s_itb_per_group; /* Number of inode table blocks per group */	35	unsigned long s_itb_per_group; /* Number of inode table blocks per group */
36	unsigned long s_gdb_count; /* Number of group descriptor blocks */	36	unsigned long s_gdb_count; /* Number of group descriptor blocks */
37	unsigned long s_desc_per_block; /* Number of group descriptors per block */	37	unsigned long s_desc_per_block; /* Number of group descriptors per block */
38	unsigned long s_groups_count; /* Number of groups in the fs */	38	ext4_group_t s_groups_count; /* Number of groups in the fs */
39	unsigned long s_overhead_last; /* Last calculated overhead */	39	unsigned long s_overhead_last; /* Last calculated overhead */
40	unsigned long s_blocks_last; /* Last seen block count */	40	unsigned long s_blocks_last; /* Last seen block count */
		41	loff_t s_bitmap_maxbytes; /* max bytes for bitmap files */
41	struct buffer_head * s_sbh; /* Buffer containing the super block */	42	struct buffer_head * s_sbh; /* Buffer containing the super block */
42	struct ext4_super_block * s_es; /* Pointer to the super block in the buffer */	43	struct ext4_super_block * s_es; /* Pointer to the super block in the buffer */
43	struct buffer_head ** s_group_desc;	44	struct buffer_head ** s_group_desc;
@@ -90,6 +91,58 @@ struct ext4_sb_info {
90	unsigned long s_ext_blocks;	91	unsigned long s_ext_blocks;
91	unsigned long s_ext_extents;	92	unsigned long s_ext_extents;
92	#endif	93	#endif
		94
		95	/* for buddy allocator */
		96	struct ext4_group_info ***s_group_info;
		97	struct inode *s_buddy_cache;
		98	long s_blocks_reserved;
		99	spinlock_t s_reserve_lock;
		100	struct list_head s_active_transaction;
		101	struct list_head s_closed_transaction;
		102	struct list_head s_committed_transaction;
		103	spinlock_t s_md_lock;
		104	tid_t s_last_transaction;
		105	unsigned short s_mb_offsets, s_mb_maxs;
		106
		107	/* tunables */
		108	unsigned long s_stripe;
		109	unsigned long s_mb_stream_request;
		110	unsigned long s_mb_max_to_scan;
		111	unsigned long s_mb_min_to_scan;
		112	unsigned long s_mb_stats;
		113	unsigned long s_mb_order2_reqs;
		114	unsigned long s_mb_group_prealloc;
		115	/* where last allocation was done - for stream allocation */
		116	unsigned long s_mb_last_group;
		117	unsigned long s_mb_last_start;
		118
		119	/* history to debug policy */
		120	struct ext4_mb_history *s_mb_history;
		121	int s_mb_history_cur;
		122	int s_mb_history_max;
		123	int s_mb_history_num;
		124	struct proc_dir_entry *s_mb_proc;
		125	spinlock_t s_mb_history_lock;
		126	int s_mb_history_filter;
		127
		128	/* stats for buddy allocator */
		129	spinlock_t s_mb_pa_lock;
		130	atomic_t s_bal_reqs; /* number of reqs with len > 1 */
		131	atomic_t s_bal_success; /* we found long enough chunks */
		132	atomic_t s_bal_allocated; /* in blocks */
		133	atomic_t s_bal_ex_scanned; /* total extents scanned */
		134	atomic_t s_bal_goals; /* goal hits */
		135	atomic_t s_bal_breaks; /* too long searches */
		136	atomic_t s_bal_2orders; /* 2^order hits */
		137	spinlock_t s_bal_lock;
		138	unsigned long s_mb_buddies_generated;
		139	unsigned long long s_mb_generation_time;
		140	atomic_t s_mb_lost_chunks;
		141	atomic_t s_mb_preallocated;
		142	atomic_t s_mb_discarded;
		143
		144	/* locality groups */
		145	struct ext4_locality_group *s_locality_groups;
93	};	146	};
94		147
95	#endif /* _LINUX_EXT4_FS_SB */	148	#endif /* _LINUX_EXT4_FS_SB */