Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71081
b: refs/heads/master
c: 3a14589
h: refs/heads/master
i:
  71079: 6564cb3
v: v3
  • Loading branch information
Aneesh Kumar K.V authored and Theodore Ts'o committed Oct 17, 2007
1 parent 685c725 commit 5dcb396
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ce421581794f6593830b056969ad7536ab929b2f
refs/heads/master: 3a14589cceea4c5d2d4de0369ee10b0fb627b107
6 changes: 3 additions & 3 deletions trunk/fs/ext4/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ static void ext4_write_super_lockfs(struct super_block *sb);
ext4_fsblk_t ext4_block_bitmap(struct super_block *sb,
struct ext4_group_desc *bg)
{
return le32_to_cpu(bg->bg_block_bitmap) |
return le32_to_cpu(bg->bg_block_bitmap_lo) |
(EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ?
(ext4_fsblk_t)le32_to_cpu(bg->bg_block_bitmap_hi) << 32 : 0);
(ext4_fsblk_t)le32_to_cpu(bg->bg_block_bitmap_hi) << 32 : 0);
}

ext4_fsblk_t ext4_inode_bitmap(struct super_block *sb,
Expand All @@ -94,7 +94,7 @@ ext4_fsblk_t ext4_inode_table(struct super_block *sb,
void ext4_block_bitmap_set(struct super_block *sb,
struct ext4_group_desc *bg, ext4_fsblk_t blk)
{
bg->bg_block_bitmap = cpu_to_le32((u32)blk);
bg->bg_block_bitmap_lo = cpu_to_le32((u32)blk);
if (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT)
bg->bg_block_bitmap_hi = cpu_to_le32(blk >> 32);
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/ext4_fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
*/
struct ext4_group_desc
{
__le32 bg_block_bitmap; /* Blocks bitmap block */
__le32 bg_block_bitmap_lo; /* Blocks bitmap block */
__le32 bg_inode_bitmap; /* Inodes bitmap block */
__le32 bg_inode_table; /* Inodes table block */
__le16 bg_free_blocks_count; /* Free blocks count */
Expand Down

0 comments on commit 5dcb396

Please sign in to comment.