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

Commit 61d08673 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: rename mark_bitmap_end() to ext4_mark_bitmap_end() 



Fix a namespace leak from fs/ext4

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

fs/ext4/balloc.c

+2 −1
Original line number Diff line number Diff line
@@ -171,7 +171,8 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, 
		 * less than the blocksize * 8 ( which is the size

		 * of bitmap ), set rest of the block bitmap to 1

		 */

		mark_bitmap_end(group_blocks, sb->s_blocksize * 8, bh->b_data);

		ext4_mark_bitmap_end(group_blocks, sb->s_blocksize * 8,

				     bh->b_data);

	}

	return free_blocks - ext4_group_used_meta_blocks(sb, block_group, gdp);

}

fs/ext4/ext4.h

+1 −1
Original line number Diff line number Diff line
@@ -1664,7 +1664,7 @@ extern struct inode * ext4_orphan_get(struct super_block *, unsigned long); 
extern unsigned long ext4_count_free_inodes(struct super_block *);

extern unsigned long ext4_count_dirs(struct super_block *);

extern void ext4_check_inodes_bitmap(struct super_block *);

extern void mark_bitmap_end(int start_bit, int end_bit, char *bitmap);

extern void ext4_mark_bitmap_end(int start_bit, int end_bit, char *bitmap);

extern int ext4_init_inode_table(struct super_block *sb,

				 ext4_group_t group, int barrier);

fs/ext4/ialloc.c

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
 * need to use it within a single byte (to ensure we get endianness right).

 * We can use memset for the rest of the bitmap as there are no other users.

 */

void mark_bitmap_end(int start_bit, int end_bit, char *bitmap)

void ext4_mark_bitmap_end(int start_bit, int end_bit, char *bitmap)

{

	int i;
@@ -86,7 +86,7 @@ static unsigned ext4_init_inode_bitmap(struct super_block *sb, 
	}



	memset(bh->b_data, 0, (EXT4_INODES_PER_GROUP(sb) + 7) / 8);

	mark_bitmap_end(EXT4_INODES_PER_GROUP(sb), sb->s_blocksize * 8,

	ext4_mark_bitmap_end(EXT4_INODES_PER_GROUP(sb), sb->s_blocksize * 8,

			bh->b_data);



	return EXT4_INODES_PER_GROUP(sb);

fs/ext4/resize.c

+4 −3
Original line number Diff line number Diff line
@@ -252,7 +252,8 @@ static int setup_new_group_blocks(struct super_block *sb, 
	if ((err = extend_or_restart_transaction(handle, 2, bh)))

		goto exit_bh;



	mark_bitmap_end(input->blocks_count, sb->s_blocksize * 8, bh->b_data);

	ext4_mark_bitmap_end(input->blocks_count, sb->s_blocksize * 8,

			     bh->b_data);

	ext4_handle_dirty_metadata(handle, NULL, bh);

	brelse(bh);

	/* Mark unused entries in inode bitmap used */
@@ -263,7 +264,7 @@ static int setup_new_group_blocks(struct super_block *sb, 
		goto exit_journal;

	}



	mark_bitmap_end(EXT4_INODES_PER_GROUP(sb), sb->s_blocksize * 8,

	ext4_mark_bitmap_end(EXT4_INODES_PER_GROUP(sb), sb->s_blocksize * 8,

			     bh->b_data);

	ext4_handle_dirty_metadata(handle, NULL, bh);

exit_bh: