diff options
Diffstat (limited to 'fs/ext4/mballoc.c')
-rw-r--r-- | fs/ext4/mballoc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 6d69dd92aadb..21ee6d42ee7b 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c | |||
@@ -2326,7 +2326,7 @@ static int ext4_mb_init_backend(struct super_block *sb) | |||
2326 | meta_group_info[j]->bb_bitmap = | 2326 | meta_group_info[j]->bb_bitmap = |
2327 | kmalloc(sb->s_blocksize, GFP_KERNEL); | 2327 | kmalloc(sb->s_blocksize, GFP_KERNEL); |
2328 | BUG_ON(meta_group_info[j]->bb_bitmap == NULL); | 2328 | BUG_ON(meta_group_info[j]->bb_bitmap == NULL); |
2329 | bh = read_block_bitmap(sb, i); | 2329 | bh = ext4_read_block_bitmap(sb, i); |
2330 | BUG_ON(bh == NULL); | 2330 | BUG_ON(bh == NULL); |
2331 | memcpy(meta_group_info[j]->bb_bitmap, bh->b_data, | 2331 | memcpy(meta_group_info[j]->bb_bitmap, bh->b_data, |
2332 | sb->s_blocksize); | 2332 | sb->s_blocksize); |
@@ -2769,7 +2769,7 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, | |||
2769 | 2769 | ||
2770 | 2770 | ||
2771 | err = -EIO; | 2771 | err = -EIO; |
2772 | bitmap_bh = read_block_bitmap(sb, ac->ac_b_ex.fe_group); | 2772 | bitmap_bh = ext4_read_block_bitmap(sb, ac->ac_b_ex.fe_group); |
2773 | if (!bitmap_bh) | 2773 | if (!bitmap_bh) |
2774 | goto out_err; | 2774 | goto out_err; |
2775 | 2775 | ||
@@ -3589,7 +3589,7 @@ ext4_mb_discard_group_preallocations(struct super_block *sb, | |||
3589 | if (list_empty(&grp->bb_prealloc_list)) | 3589 | if (list_empty(&grp->bb_prealloc_list)) |
3590 | return 0; | 3590 | return 0; |
3591 | 3591 | ||
3592 | bitmap_bh = read_block_bitmap(sb, group); | 3592 | bitmap_bh = ext4_read_block_bitmap(sb, group); |
3593 | if (bitmap_bh == NULL) { | 3593 | if (bitmap_bh == NULL) { |
3594 | /* error handling here */ | 3594 | /* error handling here */ |
3595 | ext4_mb_release_desc(&e4b); | 3595 | ext4_mb_release_desc(&e4b); |
@@ -3763,7 +3763,7 @@ repeat: | |||
3763 | err = ext4_mb_load_buddy(sb, group, &e4b); | 3763 | err = ext4_mb_load_buddy(sb, group, &e4b); |
3764 | BUG_ON(err != 0); /* error handling here */ | 3764 | BUG_ON(err != 0); /* error handling here */ |
3765 | 3765 | ||
3766 | bitmap_bh = read_block_bitmap(sb, group); | 3766 | bitmap_bh = ext4_read_block_bitmap(sb, group); |
3767 | if (bitmap_bh == NULL) { | 3767 | if (bitmap_bh == NULL) { |
3768 | /* error handling here */ | 3768 | /* error handling here */ |
3769 | ext4_mb_release_desc(&e4b); | 3769 | ext4_mb_release_desc(&e4b); |
@@ -4262,7 +4262,7 @@ do_more: | |||
4262 | overflow = bit + count - EXT4_BLOCKS_PER_GROUP(sb); | 4262 | overflow = bit + count - EXT4_BLOCKS_PER_GROUP(sb); |
4263 | count -= overflow; | 4263 | count -= overflow; |
4264 | } | 4264 | } |
4265 | bitmap_bh = read_block_bitmap(sb, block_group); | 4265 | bitmap_bh = ext4_read_block_bitmap(sb, block_group); |
4266 | if (!bitmap_bh) | 4266 | if (!bitmap_bh) |
4267 | goto error_return; | 4267 | goto error_return; |
4268 | gdp = ext4_get_group_desc(sb, block_group, &gd_bh); | 4268 | gdp = ext4_get_group_desc(sb, block_group, &gd_bh); |