ext4: use ext4_group_first_block_no()
Use ext4_group_first_block_no() and assign the return values to ext4_fsblk_t variables. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Cc: Stephen Tweedie <sct@redhat.com> Cc: adilger@clusterfs.com Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Mingming Cao <cmm@us.ibm.com>
This commit is contained in:
parent
216c34b2b8
commit
d00a6d7b40
@ -48,7 +48,6 @@ void ext4_get_group_no_and_offset(struct super_block *sb, ext4_fsblk_t blocknr,
|
||||
unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh,
|
||||
ext4_group_t block_group, struct ext4_group_desc *gdp)
|
||||
{
|
||||
unsigned long start;
|
||||
int bit, bit_max;
|
||||
unsigned free_blocks, group_blocks;
|
||||
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
||||
@ -106,11 +105,12 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh,
|
||||
free_blocks = group_blocks - bit_max;
|
||||
|
||||
if (bh) {
|
||||
ext4_fsblk_t start;
|
||||
|
||||
for (bit = 0; bit < bit_max; bit++)
|
||||
ext4_set_bit(bit, bh->b_data);
|
||||
|
||||
start = block_group * EXT4_BLOCKS_PER_GROUP(sb) +
|
||||
le32_to_cpu(sbi->s_es->s_first_data_block);
|
||||
start = ext4_group_first_block_no(sb, block_group);
|
||||
|
||||
/* Set bits for block and inode bitmaps, and inode table */
|
||||
ext4_set_bit(ext4_block_bitmap(sb, gdp) - start, bh->b_data);
|
||||
|
@ -806,10 +806,8 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,
|
||||
get_bh(new_bh);
|
||||
} else {
|
||||
/* We need to allocate a new block */
|
||||
ext4_fsblk_t goal = le32_to_cpu(
|
||||
EXT4_SB(sb)->s_es->s_first_data_block) +
|
||||
(ext4_fsblk_t)EXT4_I(inode)->i_block_group *
|
||||
EXT4_BLOCKS_PER_GROUP(sb);
|
||||
ext4_fsblk_t goal = ext4_group_first_block_no(sb,
|
||||
EXT4_I(inode)->i_block_group);
|
||||
ext4_fsblk_t block = ext4_new_block(handle, inode,
|
||||
goal, &error);
|
||||
if (error)
|
||||
|
Loading…
Reference in New Issue
Block a user