diff options
author | Theodore Ts'o <tytso@mit.edu> | 2008-07-11 19:27:31 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2008-07-11 19:27:31 -0400 |
commit | 574ca174c97f790086e3e6f2251381420ad38fd0 (patch) | |
tree | 9a29a6f69e4f5a84f434f869935e3442eaeed315 /fs/ext4/balloc.c | |
parent | 3537576a707c6df98e883b77b854c6083f844602 (diff) |
ext4: Rename read_block_bitmap() to ext4_read_block_bitmap()
Since this a non-static function, make it be ext4 specific to avoid
conflicts with potentially other filesystems.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/balloc.c')
-rw-r--r-- | fs/ext4/balloc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index c29d774abe55..ba411233cc25 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c | |||
@@ -295,7 +295,7 @@ err_out: | |||
295 | return 0; | 295 | return 0; |
296 | } | 296 | } |
297 | /** | 297 | /** |
298 | * read_block_bitmap() | 298 | * ext4_read_block_bitmap() |
299 | * @sb: super block | 299 | * @sb: super block |
300 | * @block_group: given block group | 300 | * @block_group: given block group |
301 | * | 301 | * |
@@ -305,7 +305,7 @@ err_out: | |||
305 | * Return buffer_head on success or NULL in case of failure. | 305 | * Return buffer_head on success or NULL in case of failure. |
306 | */ | 306 | */ |
307 | struct buffer_head * | 307 | struct buffer_head * |
308 | read_block_bitmap(struct super_block *sb, ext4_group_t block_group) | 308 | ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group) |
309 | { | 309 | { |
310 | struct ext4_group_desc * desc; | 310 | struct ext4_group_desc * desc; |
311 | struct buffer_head * bh = NULL; | 311 | struct buffer_head * bh = NULL; |
@@ -693,7 +693,7 @@ do_more: | |||
693 | count -= overflow; | 693 | count -= overflow; |
694 | } | 694 | } |
695 | brelse(bitmap_bh); | 695 | brelse(bitmap_bh); |
696 | bitmap_bh = read_block_bitmap(sb, block_group); | 696 | bitmap_bh = ext4_read_block_bitmap(sb, block_group); |
697 | if (!bitmap_bh) | 697 | if (!bitmap_bh) |
698 | goto error_return; | 698 | goto error_return; |
699 | desc = ext4_get_group_desc (sb, block_group, &gd_bh); | 699 | desc = ext4_get_group_desc (sb, block_group, &gd_bh); |
@@ -1733,7 +1733,7 @@ retry_alloc: | |||
1733 | my_rsv = NULL; | 1733 | my_rsv = NULL; |
1734 | 1734 | ||
1735 | if (free_blocks > 0) { | 1735 | if (free_blocks > 0) { |
1736 | bitmap_bh = read_block_bitmap(sb, group_no); | 1736 | bitmap_bh = ext4_read_block_bitmap(sb, group_no); |
1737 | if (!bitmap_bh) | 1737 | if (!bitmap_bh) |
1738 | goto io_error; | 1738 | goto io_error; |
1739 | grp_alloc_blk = ext4_try_to_allocate_with_rsv(sb, handle, | 1739 | grp_alloc_blk = ext4_try_to_allocate_with_rsv(sb, handle, |
@@ -1769,7 +1769,7 @@ retry_alloc: | |||
1769 | continue; | 1769 | continue; |
1770 | 1770 | ||
1771 | brelse(bitmap_bh); | 1771 | brelse(bitmap_bh); |
1772 | bitmap_bh = read_block_bitmap(sb, group_no); | 1772 | bitmap_bh = ext4_read_block_bitmap(sb, group_no); |
1773 | if (!bitmap_bh) | 1773 | if (!bitmap_bh) |
1774 | goto io_error; | 1774 | goto io_error; |
1775 | /* | 1775 | /* |
@@ -1985,7 +1985,7 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb) | |||
1985 | continue; | 1985 | continue; |
1986 | desc_count += le16_to_cpu(gdp->bg_free_blocks_count); | 1986 | desc_count += le16_to_cpu(gdp->bg_free_blocks_count); |
1987 | brelse(bitmap_bh); | 1987 | brelse(bitmap_bh); |
1988 | bitmap_bh = read_block_bitmap(sb, i); | 1988 | bitmap_bh = ext4_read_block_bitmap(sb, i); |
1989 | if (bitmap_bh == NULL) | 1989 | if (bitmap_bh == NULL) |
1990 | continue; | 1990 | continue; |
1991 | 1991 | ||