1 Index: linux-stage/fs/ext4/ext4.h
2 ===================================================================
3 --- linux-stage.orig/fs/ext4/ext4.h 2012-08-07 14:16:06.331203480 -0700
4 +++ linux-stage/fs/ext4/ext4.h 2012-08-10 10:08:47.854206335 -0700
6 /* following fields for parallel directory operations -bzzz */
7 struct semaphore i_append_sem;
9 + ext4_lblk_t i_dir_start_lookup;
11 * i_block_group is the number of the block group which contains
12 * this file's inode. Constant across the lifetime of the inode,
14 unsigned long i_state_flags; /* Dynamic state flags */
15 unsigned long i_flags;
17 - ext4_lblk_t i_dir_start_lookup;
18 #ifdef CONFIG_EXT4_FS_XATTR
20 * Extended attributes can be read independently of the main file
22 unsigned int i_reserved_data_blocks;
23 unsigned int i_reserved_meta_blocks;
24 unsigned int i_allocated_meta_blocks;
25 - unsigned short i_delalloc_reserved_flag;
26 sector_t i_da_metadata_calc_last_lblock;
27 int i_da_metadata_calc_len;
29 + /* allocation reservation info for delalloc */
30 + unsigned short i_delalloc_reserved_flag;
32 /* on-disk additional length */
36 /* current io_end structure for async DIO write*/
37 ext4_io_end_t *cur_aio_dio;
38 atomic_t i_aiodio_unwritten; /* Number of inflight conversions pending */
39 - struct mutex i_aio_mutex; /* big hammer for unaligned AIO */
42 * Transactions that contain inode's metadata needed to complete
43 * fsync and fdatasync, respectively.
47 - tid_t i_datasync_tid;
49 + struct mutex i_aio_mutex; /* big hammer for unaligned AIO */
53 + * Transactions that contain inode's metadata needed to complete
54 + * fsync and fdatasync, respectively.
56 + tid_t i_datasync_tid;
59 #define HAVE_DISK_INODE_VERSION