Commit dd6683e6 authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

ext4: remove ext4_{ind,ext}_calc_metadata_amount() 



Remove the ext4_ind_calc_metadata_amount() and
ext4_ext_calc_metadata_amount() functions, which have been unused since
commit 71d4f7d0 ("ext4: remove metadata reservation checks").

Also remove the i_da_metadata_calc_last_lblock and
i_da_metadata_calc_len fields from struct ext4_inode_info, as these were
only used by these removed functions.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20191231180444.46586-2-ebiggers@kernel.org


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarRitesh Harjani <riteshh@linux.ibm.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent fd5fe253

fs/ext4/ext4.h

+0 −5
Original line number Diff line number Diff line
@@ -1052,8 +1052,6 @@ struct ext4_inode_info { 
	/* allocation reservation info for delalloc */

	/* In case of bigalloc, this refer to clusters rather than blocks */

	unsigned int i_reserved_data_blocks;

	ext4_lblk_t i_da_metadata_calc_last_lblock;

	int i_da_metadata_calc_len;



	/* pending cluster reservations for bigalloc file systems */

	struct ext4_pending_tree i_pending_tree;
@@ -2692,7 +2690,6 @@ extern int ext4_issue_zeroout(struct inode *inode, ext4_lblk_t lblk, 
/* indirect.c */

extern int ext4_ind_map_blocks(handle_t *handle, struct inode *inode,

				struct ext4_map_blocks *map, int flags);

extern int ext4_ind_calc_metadata_amount(struct inode *inode, sector_t lblock);

extern int ext4_ind_trans_blocks(struct inode *inode, int nrblocks);

extern void ext4_ind_truncate(handle_t *, struct inode *inode);

extern int ext4_ind_remove_space(handle_t *handle, struct inode *inode,
@@ -3335,8 +3332,6 @@ extern int ext4_convert_unwritten_io_end_vec(handle_t *handle, 
					     ext4_io_end_t *io_end);

extern int ext4_map_blocks(handle_t *handle, struct inode *inode,

			   struct ext4_map_blocks *map, int flags);

extern int ext4_ext_calc_metadata_amount(struct inode *inode,

					 ext4_lblk_t lblocks);

extern int ext4_ext_calc_credits_for_single_extent(struct inode *inode,

						   int num,

						   struct ext4_ext_path *path);

fs/ext4/extents.c

+0 −47
Original line number Diff line number Diff line
@@ -309,53 +309,6 @@ ext4_force_split_extent_at(handle_t *handle, struct inode *inode, 
			(nofail ? EXT4_GET_BLOCKS_METADATA_NOFAIL:0));

}



/*

 * Calculate the number of metadata blocks needed

 * to allocate @blocks

 * Worse case is one block per extent

 */

int ext4_ext_calc_metadata_amount(struct inode *inode, ext4_lblk_t lblock)

{

	struct ext4_inode_info *ei = EXT4_I(inode);

	int idxs;



	idxs = ((inode->i_sb->s_blocksize - sizeof(struct ext4_extent_header))

		/ sizeof(struct ext4_extent_idx));



	/*

	 * If the new delayed allocation block is contiguous with the

	 * previous da block, it can share index blocks with the

	 * previous block, so we only need to allocate a new index

	 * block every idxs leaf blocks.  At ldxs**2 blocks, we need

	 * an additional index block, and at ldxs**3 blocks, yet

	 * another index blocks.

	 */

	if (ei->i_da_metadata_calc_len &&

	    ei->i_da_metadata_calc_last_lblock+1 == lblock) {

		int num = 0;



		if ((ei->i_da_metadata_calc_len % idxs) == 0)

			num++;

		if ((ei->i_da_metadata_calc_len % (idxs*idxs)) == 0)

			num++;

		if ((ei->i_da_metadata_calc_len % (idxs*idxs*idxs)) == 0) {

			num++;

			ei->i_da_metadata_calc_len = 0;

		} else

			ei->i_da_metadata_calc_len++;

		ei->i_da_metadata_calc_last_lblock++;

		return num;

	}



	/*

	 * In the worst case we need a new set of index blocks at

	 * every level of the inode's extent tree.

	 */

	ei->i_da_metadata_calc_len = 1;

	ei->i_da_metadata_calc_last_lblock = lblock;

	return ext_depth(inode) + 1;

}



static int

ext4_ext_max_entries(struct inode *inode, int depth)

{

fs/ext4/indirect.c

+0 −26
Original line number Diff line number Diff line
@@ -659,32 +659,6 @@ int ext4_ind_map_blocks(handle_t *handle, struct inode *inode, 
	return err;

}



/*

 * Calculate the number of metadata blocks need to reserve

 * to allocate a new block at @lblocks for non extent file based file

 */

int ext4_ind_calc_metadata_amount(struct inode *inode, sector_t lblock)

{

	struct ext4_inode_info *ei = EXT4_I(inode);

	sector_t dind_mask = ~((sector_t)EXT4_ADDR_PER_BLOCK(inode->i_sb) - 1);

	int blk_bits;



	if (lblock < EXT4_NDIR_BLOCKS)

		return 0;



	lblock -= EXT4_NDIR_BLOCKS;



	if (ei->i_da_metadata_calc_len &&

	    (lblock & dind_mask) == ei->i_da_metadata_calc_last_lblock) {

		ei->i_da_metadata_calc_len++;

		return 0;

	}

	ei->i_da_metadata_calc_last_lblock = lblock & dind_mask;

	ei->i_da_metadata_calc_len = 1;

	blk_bits = order_base_2(lblock);

	return (blk_bits / EXT4_ADDR_PER_BLOCK_BITS(inode->i_sb)) + 1;

}



/*

 * Calculate number of indirect blocks touched by mapping @nrblocks logically

 * contiguous blocks

fs/ext4/super.c

+0 −2
Original line number Diff line number Diff line
@@ -1141,8 +1141,6 @@ static struct inode *ext4_alloc_inode(struct super_block *sb) 
	ei->i_es_shk_nr = 0;

	ei->i_es_shrink_lblk = 0;

	ei->i_reserved_data_blocks = 0;

	ei->i_da_metadata_calc_len = 0;

	ei->i_da_metadata_calc_last_lblock = 0;

	spin_lock_init(&(ei->i_block_reservation_lock));

	ext4_init_pending_tree(&ei->i_pending_tree);

#ifdef CONFIG_QUOTA