ext2: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Esse commit está contido em:

commit de
Linus Torvalds

pai
2c11619a59
commit
605afd60ef
@@ -106,7 +106,7 @@ static int ext2_valid_block_bitmap(struct super_block *sb,
|
||||
return 1;
|
||||
|
||||
err_out:
|
||||
ext2_error(sb, __FUNCTION__,
|
||||
ext2_error(sb, __func__,
|
||||
"Invalid block bitmap - "
|
||||
"block_group = %d, block = %lu",
|
||||
block_group, bitmap_blk);
|
||||
@@ -132,7 +132,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
|
||||
bitmap_blk = le32_to_cpu(desc->bg_block_bitmap);
|
||||
bh = sb_getblk(sb, bitmap_blk);
|
||||
if (unlikely(!bh)) {
|
||||
ext2_error(sb, __FUNCTION__,
|
||||
ext2_error(sb, __func__,
|
||||
"Cannot read block bitmap - "
|
||||
"block_group = %d, block_bitmap = %u",
|
||||
block_group, le32_to_cpu(desc->bg_block_bitmap));
|
||||
@@ -143,7 +143,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
|
||||
|
||||
if (bh_submit_read(bh) < 0) {
|
||||
brelse(bh);
|
||||
ext2_error(sb, __FUNCTION__,
|
||||
ext2_error(sb, __func__,
|
||||
"Cannot read block bitmap - "
|
||||
"block_group = %d, block_bitmap = %u",
|
||||
block_group, le32_to_cpu(desc->bg_block_bitmap));
|
||||
@@ -248,7 +248,7 @@ restart:
|
||||
BUG_ON(bad);
|
||||
}
|
||||
#define rsv_window_dump(root, verbose) \
|
||||
__rsv_window_dump((root), (verbose), __FUNCTION__)
|
||||
__rsv_window_dump((root), (verbose), __func__)
|
||||
#else
|
||||
#define rsv_window_dump(root, verbose) do {} while (0)
|
||||
#endif
|
||||
@@ -547,7 +547,7 @@ do_more:
|
||||
for (i = 0, group_freed = 0; i < count; i++) {
|
||||
if (!ext2_clear_bit_atomic(sb_bgl_lock(sbi, block_group),
|
||||
bit + i, bitmap_bh->b_data)) {
|
||||
ext2_error(sb, __FUNCTION__,
|
||||
ext2_error(sb, __func__,
|
||||
"bit already cleared for block %lu", block + i);
|
||||
} else {
|
||||
group_freed++;
|
||||
|
Referência em uma nova issue
Block a user