Merge tag 'dm-3.4-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm

[linux.git] / fs / ext4 / mballoc.h

diff --git a/fs/ext4/mballoc.h b/fs/ext4/mballoc.h
index 47705f3285e3c145f171dcd2add8c6d311d8298e..c070618c21ce8e4d4f6bb00fff94136e2c2bf615 100644 (file)
--- a/fs/ext4/mballoc.h
+++ b/fs/ext4/mballoc.h
@@ -96,21 +96,23 @@ extern u8 mb_enable_debug;
 
 
 struct ext4_free_data {
-       /* this links the free block information from group_info */
-       struct rb_node node;
+       /* MUST be the first member */
+       struct ext4_journal_cb_entry    efd_jce;
+
+       /* ext4_free_data private data starts from here */
 
-       /* this links the free block information from ext4_sb_info */
-       struct list_head list;
+       /* this links the free block information from group_info */
+       struct rb_node                  efd_node;
 
        /* group which free block extent belongs */
-       ext4_group_t group;
+       ext4_group_t                    efd_group;
 
        /* free block extent */
-       ext4_grpblk_t start_cluster;
-       ext4_grpblk_t count;
+       ext4_grpblk_t                   efd_start_cluster;
+       ext4_grpblk_t                   efd_count;
 
        /* transaction which freed this extent */
-       tid_t   t_tid;
+       tid_t                           efd_tid;
 };
 
 struct ext4_prealloc_space {
@@ -210,8 +212,6 @@ struct ext4_buddy {
        __u16 bd_blkbits;
        ext4_group_t bd_group;
 };
-#define EXT4_MB_BITMAP(e4b)    ((e4b)->bd_bitmap)
-#define EXT4_MB_BUDDY(e4b)     ((e4b)->bd_buddy)
 
 static inline ext4_fsblk_t ext4_grp_offs_to_block(struct super_block *sb,
                                        struct ext4_free_extent *fex)