diff options
author | Alexandre Ratchov <alexandre.ratchov@bull.net> | 2006-10-11 04:21:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 14:14:18 -0400 |
commit | 8fadc14323684c547f74cf2f4d13517c6c264731 (patch) | |
tree | 2b3eedf241a0d7c86f6b808f76e267ded28506ed /include/linux | |
parent | 0d1ee42f27d30eed1659f3e85bcbbc7b3711f61f (diff) |
[PATCH] ext4: move block number hi bits
move '_hi' bits of block numbers in the larger part of the
block group descriptor structure
Signed-off-by: Alexandre Ratchov <alexandre.ratchov@bull.net>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/ext4_fs.h | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h index a3df2afc004b..296609b9242d 100644 --- a/include/linux/ext4_fs.h +++ b/include/linux/ext4_fs.h | |||
@@ -129,10 +129,10 @@ struct ext4_group_desc | |||
129 | __le16 bg_free_inodes_count; /* Free inodes count */ | 129 | __le16 bg_free_inodes_count; /* Free inodes count */ |
130 | __le16 bg_used_dirs_count; /* Directories count */ | 130 | __le16 bg_used_dirs_count; /* Directories count */ |
131 | __u16 bg_flags; | 131 | __u16 bg_flags; |
132 | __le16 bg_block_bitmap_hi; /* Blocks bitmap block MSB */ | 132 | __u32 bg_reserved[3]; |
133 | __le16 bg_inode_bitmap_hi; /* Inodes bitmap block MSB */ | 133 | __le32 bg_block_bitmap_hi; /* Blocks bitmap block MSB */ |
134 | __le16 bg_inode_table_hi; /* Inodes table block MSB */ | 134 | __le32 bg_inode_bitmap_hi; /* Inodes bitmap block MSB */ |
135 | __u16 bg_reserved[3]; | 135 | __le32 bg_inode_table_hi; /* Inodes table block MSB */ |
136 | }; | 136 | }; |
137 | 137 | ||
138 | #ifdef __KERNEL__ | 138 | #ifdef __KERNEL__ |
@@ -143,6 +143,7 @@ struct ext4_group_desc | |||
143 | * Macro-instructions used to manage group descriptors | 143 | * Macro-instructions used to manage group descriptors |
144 | */ | 144 | */ |
145 | #define EXT4_MIN_DESC_SIZE 32 | 145 | #define EXT4_MIN_DESC_SIZE 32 |
146 | #define EXT4_MIN_DESC_SIZE_64BIT 64 | ||
146 | #define EXT4_MAX_DESC_SIZE EXT4_MIN_BLOCK_SIZE | 147 | #define EXT4_MAX_DESC_SIZE EXT4_MIN_BLOCK_SIZE |
147 | #define EXT4_DESC_SIZE(s) (EXT4_SB(s)->s_desc_size) | 148 | #define EXT4_DESC_SIZE(s) (EXT4_SB(s)->s_desc_size) |
148 | #ifdef __KERNEL__ | 149 | #ifdef __KERNEL__ |
@@ -904,12 +905,18 @@ extern void ext4_abort (struct super_block *, const char *, const char *, ...) | |||
904 | extern void ext4_warning (struct super_block *, const char *, const char *, ...) | 905 | extern void ext4_warning (struct super_block *, const char *, const char *, ...) |
905 | __attribute__ ((format (printf, 3, 4))); | 906 | __attribute__ ((format (printf, 3, 4))); |
906 | extern void ext4_update_dynamic_rev (struct super_block *sb); | 907 | extern void ext4_update_dynamic_rev (struct super_block *sb); |
907 | extern ext4_fsblk_t ext4_block_bitmap(struct ext4_group_desc *bg); | 908 | extern ext4_fsblk_t ext4_block_bitmap(struct super_block *sb, |
908 | extern ext4_fsblk_t ext4_inode_bitmap(struct ext4_group_desc *bg); | 909 | struct ext4_group_desc *bg); |
909 | extern ext4_fsblk_t ext4_inode_table(struct ext4_group_desc *bg); | 910 | extern ext4_fsblk_t ext4_inode_bitmap(struct super_block *sb, |
910 | extern void ext4_block_bitmap_set(struct ext4_group_desc *bg, ext4_fsblk_t blk); | 911 | struct ext4_group_desc *bg); |
911 | extern void ext4_inode_bitmap_set(struct ext4_group_desc *bg, ext4_fsblk_t blk); | 912 | extern ext4_fsblk_t ext4_inode_table(struct super_block *sb, |
912 | extern void ext4_inode_table_set(struct ext4_group_desc *bg, ext4_fsblk_t blk); | 913 | struct ext4_group_desc *bg); |
914 | extern void ext4_block_bitmap_set(struct super_block *sb, | ||
915 | struct ext4_group_desc *bg, ext4_fsblk_t blk); | ||
916 | extern void ext4_inode_bitmap_set(struct super_block *sb, | ||
917 | struct ext4_group_desc *bg, ext4_fsblk_t blk); | ||
918 | extern void ext4_inode_table_set(struct super_block *sb, | ||
919 | struct ext4_group_desc *bg, ext4_fsblk_t blk); | ||
913 | 920 | ||
914 | static inline ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es) | 921 | static inline ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es) |
915 | { | 922 | { |