Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cff1dfd7 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: rename ext4_free_blocks_after_init() to ext4_free_clusters_after_init() 



This function really returns the number of clusters after initializing
an uninitalized block bitmap has been initialized.

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 5dee5437

fs/ext4/balloc.c

+3 −3
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ void ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, 
/* Return the number of free blocks in a block group.  It is used when

 * the block bitmap is uninitialized, so we can't just count the bits

 * in the bitmap. */

unsigned ext4_free_blocks_after_init(struct super_block *sb,

unsigned ext4_free_clusters_after_init(struct super_block *sb,

				       ext4_group_t block_group,

				       struct ext4_group_desc *gdp)

{

fs/ext4/ext4.h

+3 −3
Original line number Diff line number Diff line
@@ -1787,7 +1787,7 @@ extern void ext4_init_block_bitmap(struct super_block *sb, 
				   struct buffer_head *bh,

				   ext4_group_t group,

				   struct ext4_group_desc *desc);

extern unsigned ext4_free_blocks_after_init(struct super_block *sb,

extern unsigned ext4_free_clusters_after_init(struct super_block *sb,

					      ext4_group_t block_group,

					      struct ext4_group_desc *gdp);

extern unsigned ext4_num_base_meta_clusters(struct super_block *sb,

fs/ext4/ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode, 
		if (gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {

			gdp->bg_flags &= cpu_to_le16(~EXT4_BG_BLOCK_UNINIT);

			ext4_free_group_clusters_set(sb, gdp,

				ext4_free_blocks_after_init(sb, group, gdp));

				ext4_free_clusters_after_init(sb, group, gdp));

			gdp->bg_checksum = ext4_group_desc_csum(sbi, group,

								gdp);

		}

fs/ext4/mballoc.c

+2 −2
Original line number Diff line number Diff line
@@ -2253,7 +2253,7 @@ int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group, 
	 */

	if (desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {

		meta_group_info[i]->bb_free =

			ext4_free_blocks_after_init(sb, group, desc);

			ext4_free_clusters_after_init(sb, group, desc);

	} else {

		meta_group_info[i]->bb_free =

			ext4_free_group_clusters(sb, desc);
@@ -2840,7 +2840,7 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, 
	if (gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {

		gdp->bg_flags &= cpu_to_le16(~EXT4_BG_BLOCK_UNINIT);

		ext4_free_group_clusters_set(sb, gdp,

					     ext4_free_blocks_after_init(sb,

					     ext4_free_clusters_after_init(sb,

						ac->ac_b_ex.fe_group, gdp));

	}

	len = ext4_free_group_clusters(sb, gdp) - ac->ac_b_ex.fe_len;