diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 13:02:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 13:02:55 -0400 |
| commit | 69e1aaddd63104f37021d0b0f6abfd9623c9134c (patch) | |
| tree | 14ad49741b428d270b681694bb2df349465455b9 /fs/ext4/mballoc.h | |
| parent | 56b59b429b4c26e5e730bc8c3d837de9f7d0a966 (diff) | |
| parent | 9d547c35799a4ddd235f1565cec2fff6c9263504 (diff) | |
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 updates for 3.4 from Ted Ts'o:
"Ext4 commits for 3.3 merge window; mostly cleanups and bug fixes
The changes to export dirty_writeback_interval are from Artem's s_dirt
cleanup patch series. The same is true of the change to remove the
s_dirt helper functions which never got used by anyone in-tree. I've
run these changes by Al Viro, and am carrying them so that Artem can
more easily fix up the rest of the file systems during the next merge
window. (Originally we had hopped to remove the use of s_dirt from
ext4 during this merge window, but his patches had some bugs, so I
ultimately ended dropping them from the ext4 tree.)"
* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (66 commits)
vfs: remove unused superblock helpers
mm: export dirty_writeback_interval
ext4: remove useless s_dirt assignment
ext4: write superblock only once on unmount
ext4: do not mark superblock as dirty unnecessarily
ext4: correct ext4_punch_hole return codes
ext4: remove restrictive checks for EOFBLOCKS_FL
ext4: always set then trimmed blocks count into len
ext4: fix trimmed block count accunting
ext4: fix start and len arguments handling in ext4_trim_fs()
ext4: update s_free_{inodes,blocks}_count during online resize
ext4: change some printk() calls to use ext4_msg() instead
ext4: avoid output message interleaving in ext4_error_<foo>()
ext4: remove trailing newlines from ext4_msg() and ext4_error() messages
ext4: add no_printk argument validation, fix fallout
ext4: remove redundant "EXT4-fs: " from uses of ext4_msg
ext4: give more helpful error message in ext4_ext_rm_leaf()
ext4: remove unused code from ext4_ext_map_blocks()
ext4: rewrite punch hole to use ext4_ext_remove_space()
jbd2: cleanup journal tail after transaction commit
...
Diffstat (limited to 'fs/ext4/mballoc.h')
| -rw-r--r-- | fs/ext4/mballoc.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/ext4/mballoc.h b/fs/ext4/mballoc.h index 47705f3285e3..c070618c21ce 100644 --- a/fs/ext4/mballoc.h +++ b/fs/ext4/mballoc.h | |||
| @@ -96,21 +96,23 @@ extern u8 mb_enable_debug; | |||
| 96 | 96 | ||
| 97 | 97 | ||
| 98 | struct ext4_free_data { | 98 | struct ext4_free_data { |
| 99 | /* this links the free block information from group_info */ | 99 | /* MUST be the first member */ |
| 100 | struct rb_node node; | 100 | struct ext4_journal_cb_entry efd_jce; |
| 101 | |||
| 102 | /* ext4_free_data private data starts from here */ | ||
| 101 | 103 | ||
| 102 | /* this links the free block information from ext4_sb_info */ | 104 | /* this links the free block information from group_info */ |
| 103 | struct list_head list; | 105 | struct rb_node efd_node; |
| 104 | 106 | ||
| 105 | /* group which free block extent belongs */ | 107 | /* group which free block extent belongs */ |
| 106 | ext4_group_t group; | 108 | ext4_group_t efd_group; |
| 107 | 109 | ||
| 108 | /* free block extent */ | 110 | /* free block extent */ |
| 109 | ext4_grpblk_t start_cluster; | 111 | ext4_grpblk_t efd_start_cluster; |
| 110 | ext4_grpblk_t count; | 112 | ext4_grpblk_t efd_count; |
| 111 | 113 | ||
| 112 | /* transaction which freed this extent */ | 114 | /* transaction which freed this extent */ |
| 113 | tid_t t_tid; | 115 | tid_t efd_tid; |
| 114 | }; | 116 | }; |
| 115 | 117 | ||
| 116 | struct ext4_prealloc_space { | 118 | struct ext4_prealloc_space { |
| @@ -210,8 +212,6 @@ struct ext4_buddy { | |||
| 210 | __u16 bd_blkbits; | 212 | __u16 bd_blkbits; |
| 211 | ext4_group_t bd_group; | 213 | ext4_group_t bd_group; |
| 212 | }; | 214 | }; |
| 213 | #define EXT4_MB_BITMAP(e4b) ((e4b)->bd_bitmap) | ||
| 214 | #define EXT4_MB_BUDDY(e4b) ((e4b)->bd_buddy) | ||
| 215 | 215 | ||
| 216 | static inline ext4_fsblk_t ext4_grp_offs_to_block(struct super_block *sb, | 216 | static inline ext4_fsblk_t ext4_grp_offs_to_block(struct super_block *sb, |
| 217 | struct ext4_free_extent *fex) | 217 | struct ext4_free_extent *fex) |