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

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
...@@ -171,7 +171,8 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, ...@@ -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 * less than the blocksize * 8 ( which is the size
* of bitmap ), set rest of the block bitmap to 1 * 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); return free_blocks - ext4_group_used_meta_blocks(sb, block_group, gdp);
} }
......
...@@ -1664,7 +1664,7 @@ extern struct inode * ext4_orphan_get(struct super_block *, unsigned long); ...@@ -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_free_inodes(struct super_block *);
extern unsigned long ext4_count_dirs(struct super_block *); extern unsigned long ext4_count_dirs(struct super_block *);
extern void ext4_check_inodes_bitmap(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, extern int ext4_init_inode_table(struct super_block *sb,
ext4_group_t group, int barrier); ext4_group_t group, int barrier);
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
* need to use it within a single byte (to ensure we get endianness right). * 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. * 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; int i;
...@@ -86,7 +86,7 @@ static unsigned ext4_init_inode_bitmap(struct super_block *sb, ...@@ -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); 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); bh->b_data);
return EXT4_INODES_PER_GROUP(sb); return EXT4_INODES_PER_GROUP(sb);
......
...@@ -252,7 +252,8 @@ static int setup_new_group_blocks(struct super_block *sb, ...@@ -252,7 +252,8 @@ static int setup_new_group_blocks(struct super_block *sb,
if ((err = extend_or_restart_transaction(handle, 2, bh))) if ((err = extend_or_restart_transaction(handle, 2, bh)))
goto exit_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); ext4_handle_dirty_metadata(handle, NULL, bh);
brelse(bh); brelse(bh);
/* Mark unused entries in inode bitmap used */ /* Mark unused entries in inode bitmap used */
...@@ -263,8 +264,8 @@ static int setup_new_group_blocks(struct super_block *sb, ...@@ -263,8 +264,8 @@ static int setup_new_group_blocks(struct super_block *sb,
goto exit_journal; 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); bh->b_data);
ext4_handle_dirty_metadata(handle, NULL, bh); ext4_handle_dirty_metadata(handle, NULL, bh);
exit_bh: exit_bh:
brelse(bh); brelse(bh);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment