aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext2/balloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext2/balloc.c')
-rw-r--r--fs/ext2/balloc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index c834f512dce..25dec8633c9 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -106,7 +106,7 @@ static int ext2_valid_block_bitmap(struct super_block *sb,
106 return 1; 106 return 1;
107 107
108err_out: 108err_out:
109 ext2_error(sb, __FUNCTION__, 109 ext2_error(sb, __func__,
110 "Invalid block bitmap - " 110 "Invalid block bitmap - "
111 "block_group = %d, block = %lu", 111 "block_group = %d, block = %lu",
112 block_group, bitmap_blk); 112 block_group, bitmap_blk);
@@ -132,7 +132,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
132 bitmap_blk = le32_to_cpu(desc->bg_block_bitmap); 132 bitmap_blk = le32_to_cpu(desc->bg_block_bitmap);
133 bh = sb_getblk(sb, bitmap_blk); 133 bh = sb_getblk(sb, bitmap_blk);
134 if (unlikely(!bh)) { 134 if (unlikely(!bh)) {
135 ext2_error(sb, __FUNCTION__, 135 ext2_error(sb, __func__,
136 "Cannot read block bitmap - " 136 "Cannot read block bitmap - "
137 "block_group = %d, block_bitmap = %u", 137 "block_group = %d, block_bitmap = %u",
138 block_group, le32_to_cpu(desc->bg_block_bitmap)); 138 block_group, le32_to_cpu(desc->bg_block_bitmap));
@@ -143,7 +143,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
143 143
144 if (bh_submit_read(bh) < 0) { 144 if (bh_submit_read(bh) < 0) {
145 brelse(bh); 145 brelse(bh);
146 ext2_error(sb, __FUNCTION__, 146 ext2_error(sb, __func__,
147 "Cannot read block bitmap - " 147 "Cannot read block bitmap - "
148 "block_group = %d, block_bitmap = %u", 148 "block_group = %d, block_bitmap = %u",
149 block_group, le32_to_cpu(desc->bg_block_bitmap)); 149 block_group, le32_to_cpu(desc->bg_block_bitmap));
@@ -248,7 +248,7 @@ restart:
248 BUG_ON(bad); 248 BUG_ON(bad);
249} 249}
250#define rsv_window_dump(root, verbose) \ 250#define rsv_window_dump(root, verbose) \
251 __rsv_window_dump((root), (verbose), __FUNCTION__) 251 __rsv_window_dump((root), (verbose), __func__)
252#else 252#else
253#define rsv_window_dump(root, verbose) do {} while (0) 253#define rsv_window_dump(root, verbose) do {} while (0)
254#endif 254#endif
@@ -547,7 +547,7 @@ do_more:
547 for (i = 0, group_freed = 0; i < count; i++) { 547 for (i = 0, group_freed = 0; i < count; i++) {
548 if (!ext2_clear_bit_atomic(sb_bgl_lock(sbi, block_group), 548 if (!ext2_clear_bit_atomic(sb_bgl_lock(sbi, block_group),
549 bit + i, bitmap_bh->b_data)) { 549 bit + i, bitmap_bh->b_data)) {
550 ext2_error(sb, __FUNCTION__, 550 ext2_error(sb, __func__,
551 "bit already cleared for block %lu", block + i); 551 "bit already cleared for block %lu", block + i);
552 } else { 552 } else {
553 group_freed++; 553 group_freed++;