Skip to content

Commit 605afd6

Browse files
hharrisontorvalds
hharrison
authored and
torvalds
committed
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>
1 parent 2c11619 commit 605afd6

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎fs/ext2/balloc.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static int ext2_valid_block_bitmap(struct super_block *sb,
106106
return 1;
107107

108108
err_out:
109-
ext2_error(sb, __FUNCTION__,
109+
ext2_error(sb, __func__,
110110
"Invalid block bitmap - "
111111
"block_group = %d, block = %lu",
112112
block_group, bitmap_blk);
@@ -132,7 +132,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
132132
bitmap_blk = le32_to_cpu(desc->bg_block_bitmap);
133133
bh = sb_getblk(sb, bitmap_blk);
134134
if (unlikely(!bh)) {
135-
ext2_error(sb, __FUNCTION__,
135+
ext2_error(sb, __func__,
136136
"Cannot read block bitmap - "
137137
"block_group = %d, block_bitmap = %u",
138138
block_group, le32_to_cpu(desc->bg_block_bitmap));
@@ -143,7 +143,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
143143

144144
if (bh_submit_read(bh) < 0) {
145145
brelse(bh);
146-
ext2_error(sb, __FUNCTION__,
146+
ext2_error(sb, __func__,
147147
"Cannot read block bitmap - "
148148
"block_group = %d, block_bitmap = %u",
149149
block_group, le32_to_cpu(desc->bg_block_bitmap));
@@ -248,7 +248,7 @@ static void __rsv_window_dump(struct rb_root *root, int verbose,
248248
BUG_ON(bad);
249249
}
250250
#define rsv_window_dump(root, verbose) \
251-
__rsv_window_dump((root), (verbose), __FUNCTION__)
251+
__rsv_window_dump((root), (verbose), __func__)
252252
#else
253253
#define rsv_window_dump(root, verbose) do {} while (0)
254254
#endif
@@ -547,7 +547,7 @@ void ext2_free_blocks (struct inode * inode, unsigned long block,
547547
for (i = 0, group_freed = 0; i < count; i++) {
548548
if (!ext2_clear_bit_atomic(sb_bgl_lock(sbi, block_group),
549549
bit + i, bitmap_bh->b_data)) {
550-
ext2_error(sb, __FUNCTION__,
550+
ext2_error(sb, __func__,
551551
"bit already cleared for block %lu", block + i);
552552
} else {
553553
group_freed++;

‎fs/ext2/dir.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
295295
struct page *page = ext2_get_page(inode, n);
296296

297297
if (IS_ERR(page)) {
298-
ext2_error(sb, __FUNCTION__,
298+
ext2_error(sb, __func__,
299299
"bad page in #%lu",
300300
inode->i_ino);
301301
filp->f_pos += PAGE_CACHE_SIZE - offset;
@@ -314,7 +314,7 @@ ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
314314
limit = kaddr + ext2_last_byte(inode, n) - EXT2_DIR_REC_LEN(1);
315315
for ( ;(char*)de <= limit; de = ext2_next_entry(de)) {
316316
if (de->rec_len == 0) {
317-
ext2_error(sb, __FUNCTION__,
317+
ext2_error(sb, __func__,
318318
"zero-length directory entry");
319319
ext2_put_page(page);
320320
return -EIO;
@@ -381,7 +381,7 @@ struct ext2_dir_entry_2 * ext2_find_entry (struct inode * dir,
381381
kaddr += ext2_last_byte(dir, n) - reclen;
382382
while ((char *) de <= kaddr) {
383383
if (de->rec_len == 0) {
384-
ext2_error(dir->i_sb, __FUNCTION__,
384+
ext2_error(dir->i_sb, __func__,
385385
"zero-length directory entry");
386386
ext2_put_page(page);
387387
goto out;
@@ -396,7 +396,7 @@ struct ext2_dir_entry_2 * ext2_find_entry (struct inode * dir,
396396
n = 0;
397397
/* next page is past the blocks we've got */
398398
if (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) {
399-
ext2_error(dir->i_sb, __FUNCTION__,
399+
ext2_error(dir->i_sb, __func__,
400400
"dir %lu size %lld exceeds block count %llu",
401401
dir->i_ino, dir->i_size,
402402
(unsigned long long)dir->i_blocks);
@@ -506,7 +506,7 @@ int ext2_add_link (struct dentry *dentry, struct inode *inode)
506506
goto got_it;
507507
}
508508
if (de->rec_len == 0) {
509-
ext2_error(dir->i_sb, __FUNCTION__,
509+
ext2_error(dir->i_sb, __func__,
510510
"zero-length directory entry");
511511
err = -EIO;
512512
goto out_unlock;
@@ -578,7 +578,7 @@ int ext2_delete_entry (struct ext2_dir_entry_2 * dir, struct page * page )
578578

579579
while ((char*)de < (char*)dir) {
580580
if (de->rec_len == 0) {
581-
ext2_error(inode->i_sb, __FUNCTION__,
581+
ext2_error(inode->i_sb, __func__,
582582
"zero-length directory entry");
583583
err = -EIO;
584584
goto out;
@@ -670,7 +670,7 @@ int ext2_empty_dir (struct inode * inode)
670670

671671
while ((char *)de <= kaddr) {
672672
if (de->rec_len == 0) {
673-
ext2_error(inode->i_sb, __FUNCTION__,
673+
ext2_error(inode->i_sb, __func__,
674674
"zero-length directory entry");
675675
printk("kaddr=%p, de=%p\n", kaddr, de);
676676
goto not_empty;

‎fs/ext2/super.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void ext2_update_dynamic_rev(struct super_block *sb)
8989
if (le32_to_cpu(es->s_rev_level) > EXT2_GOOD_OLD_REV)
9090
return;
9191

92-
ext2_warning(sb, __FUNCTION__,
92+
ext2_warning(sb, __func__,
9393
"updating to rev %d because of new feature flag, "
9494
"running e2fsck is recommended",
9595
EXT2_DYNAMIC_REV);
@@ -1060,7 +1060,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
10601060
goto failed_mount3;
10611061
}
10621062
if (EXT2_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL))
1063-
ext2_warning(sb, __FUNCTION__,
1063+
ext2_warning(sb, __func__,
10641064
"mounting ext3 filesystem as ext2");
10651065
ext2_setup_super (sb, es, sb->s_flags & MS_RDONLY);
10661066
return 0;
@@ -1177,7 +1177,7 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data)
11771177
if (((sbi->s_mount_opt & EXT2_MOUNT_XIP) !=
11781178
(old_mount_opt & EXT2_MOUNT_XIP)) &&
11791179
invalidate_inodes(sb))
1180-
ext2_warning(sb, __FUNCTION__, "busy inodes while remounting "\
1180+
ext2_warning(sb, __func__, "busy inodes while remounting "\
11811181
"xip remain in cache (no functional problem)");
11821182
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
11831183
return 0;

‎fs/ext2/xip.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void ext2_xip_verify_sb(struct super_block *sb)
6868
if ((sbi->s_mount_opt & EXT2_MOUNT_XIP) &&
6969
!sb->s_bdev->bd_disk->fops->direct_access) {
7070
sbi->s_mount_opt &= (~EXT2_MOUNT_XIP);
71-
ext2_warning(sb, __FUNCTION__,
71+
ext2_warning(sb, __func__,
7272
"ignoring xip option - not supported by bdev");
7373
}
7474
}

0 commit comments

Comments
 (0)