Merge commit 'v2.6.27-rc3' into core/urgent

[linux-2.6] / fs / ext4 / ext4_i.h

diff --git a/fs/ext4/ext4_i.h b/fs/ext4/ext4_i.h
index abf2744164e07202d64acc462910c8f65cdc776d..ef7409f0e7e475fde5afb303b68cdcd7c05e8b1c 100644 (file)
--- a/fs/ext4/ext4_i.h
+++ b/fs/ext4/ext4_i.h
@@ -150,6 +150,7 @@ struct ext4_inode_info {
         */
        struct rw_semaphore i_data_sem;
        struct inode vfs_inode;
+       struct jbd2_inode jinode;
 
        unsigned long i_ext_generation;
        struct ext4_ext_cache i_cached_extent;
@@ -162,6 +163,13 @@ struct ext4_inode_info {
        /* mballoc */
        struct list_head i_prealloc_list;
        spinlock_t i_prealloc_lock;
+
+       /* allocation reservation info for delalloc */
+       unsigned long i_reserved_data_blocks;
+       unsigned long i_reserved_meta_blocks;
+       unsigned long i_allocated_meta_blocks;
+       unsigned short i_delalloc_reserved_flag;
+       spinlock_t i_block_reservation_lock;
 };
 
 #endif /* _EXT4_I */