Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 605afd60ef6dde254fc9b8667c5bccebade251c3

Authored by Harvey Harrison
Committed by Linus Torvalds
1 parent 2c11619a59
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 4 changed files with 16 additions and 16 deletions Side-by-side Diff

... ... @@ -106,7 +106,7 @@
106 106 return 1;
107 107  
108 108 err_out:
109   - ext2_error(sb, __FUNCTION__,
  109 + ext2_error(sb, __func__,
110 110 "Invalid block bitmap - "
111 111 "block_group = %d, block = %lu",
112 112 block_group, bitmap_blk);
... ... @@ -132,7 +132,7 @@
132 132 bitmap_blk = le32_to_cpu(desc->bg_block_bitmap);
133 133 bh = sb_getblk(sb, bitmap_blk);
134 134 if (unlikely(!bh)) {
135   - ext2_error(sb, __FUNCTION__,
  135 + ext2_error(sb, __func__,
136 136 "Cannot read block bitmap - "
137 137 "block_group = %d, block_bitmap = %u",
138 138 block_group, le32_to_cpu(desc->bg_block_bitmap));
... ... @@ -143,7 +143,7 @@
143 143  
144 144 if (bh_submit_read(bh) < 0) {
145 145 brelse(bh);
146   - ext2_error(sb, __FUNCTION__,
  146 + ext2_error(sb, __func__,
147 147 "Cannot read block bitmap - "
148 148 "block_group = %d, block_bitmap = %u",
149 149 block_group, le32_to_cpu(desc->bg_block_bitmap));
... ... @@ -248,7 +248,7 @@
248 248 BUG_ON(bad);
249 249 }
250 250 #define rsv_window_dump(root, verbose) \
251   - __rsv_window_dump((root), (verbose), __FUNCTION__)
  251 + __rsv_window_dump((root), (verbose), __func__)
252 252 #else
253 253 #define rsv_window_dump(root, verbose) do {} while (0)
254 254 #endif
... ... @@ -547,7 +547,7 @@
547 547 for (i = 0, group_freed = 0; i < count; i++) {
548 548 if (!ext2_clear_bit_atomic(sb_bgl_lock(sbi, block_group),
549 549 bit + i, bitmap_bh->b_data)) {
550   - ext2_error(sb, __FUNCTION__,
  550 + ext2_error(sb, __func__,
551 551 "bit already cleared for block %lu", block + i);
552 552 } else {
553 553 group_freed++;
... ... @@ -295,7 +295,7 @@
295 295 struct page *page = ext2_get_page(inode, n);
296 296  
297 297 if (IS_ERR(page)) {
298   - ext2_error(sb, __FUNCTION__,
  298 + ext2_error(sb, __func__,
299 299 "bad page in #%lu",
300 300 inode->i_ino);
301 301 filp->f_pos += PAGE_CACHE_SIZE - offset;
... ... @@ -314,7 +314,7 @@
314 314 limit = kaddr + ext2_last_byte(inode, n) - EXT2_DIR_REC_LEN(1);
315 315 for ( ;(char*)de <= limit; de = ext2_next_entry(de)) {
316 316 if (de->rec_len == 0) {
317   - ext2_error(sb, __FUNCTION__,
  317 + ext2_error(sb, __func__,
318 318 "zero-length directory entry");
319 319 ext2_put_page(page);
320 320 return -EIO;
... ... @@ -381,7 +381,7 @@
381 381 kaddr += ext2_last_byte(dir, n) - reclen;
382 382 while ((char *) de <= kaddr) {
383 383 if (de->rec_len == 0) {
384   - ext2_error(dir->i_sb, __FUNCTION__,
  384 + ext2_error(dir->i_sb, __func__,
385 385 "zero-length directory entry");
386 386 ext2_put_page(page);
387 387 goto out;
... ... @@ -396,7 +396,7 @@
396 396 n = 0;
397 397 /* next page is past the blocks we've got */
398 398 if (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) {
399   - ext2_error(dir->i_sb, __FUNCTION__,
  399 + ext2_error(dir->i_sb, __func__,
400 400 "dir %lu size %lld exceeds block count %llu",
401 401 dir->i_ino, dir->i_size,
402 402 (unsigned long long)dir->i_blocks);
... ... @@ -506,7 +506,7 @@
506 506 goto got_it;
507 507 }
508 508 if (de->rec_len == 0) {
509   - ext2_error(dir->i_sb, __FUNCTION__,
  509 + ext2_error(dir->i_sb, __func__,
510 510 "zero-length directory entry");
511 511 err = -EIO;
512 512 goto out_unlock;
... ... @@ -578,7 +578,7 @@
578 578  
579 579 while ((char*)de < (char*)dir) {
580 580 if (de->rec_len == 0) {
581   - ext2_error(inode->i_sb, __FUNCTION__,
  581 + ext2_error(inode->i_sb, __func__,
582 582 "zero-length directory entry");
583 583 err = -EIO;
584 584 goto out;
... ... @@ -670,7 +670,7 @@
670 670  
671 671 while ((char *)de <= kaddr) {
672 672 if (de->rec_len == 0) {
673   - ext2_error(inode->i_sb, __FUNCTION__,
  673 + ext2_error(inode->i_sb, __func__,
674 674 "zero-length directory entry");
675 675 printk("kaddr=%p, de=%p\n", kaddr, de);
676 676 goto not_empty;
... ... @@ -89,7 +89,7 @@
89 89 if (le32_to_cpu(es->s_rev_level) > EXT2_GOOD_OLD_REV)
90 90 return;
91 91  
92   - ext2_warning(sb, __FUNCTION__,
  92 + ext2_warning(sb, __func__,
93 93 "updating to rev %d because of new feature flag, "
94 94 "running e2fsck is recommended",
95 95 EXT2_DYNAMIC_REV);
... ... @@ -1060,7 +1060,7 @@
1060 1060 goto failed_mount3;
1061 1061 }
1062 1062 if (EXT2_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL))
1063   - ext2_warning(sb, __FUNCTION__,
  1063 + ext2_warning(sb, __func__,
1064 1064 "mounting ext3 filesystem as ext2");
1065 1065 ext2_setup_super (sb, es, sb->s_flags & MS_RDONLY);
1066 1066 return 0;
... ... @@ -1177,7 +1177,7 @@
1177 1177 if (((sbi->s_mount_opt & EXT2_MOUNT_XIP) !=
1178 1178 (old_mount_opt & EXT2_MOUNT_XIP)) &&
1179 1179 invalidate_inodes(sb))
1180   - ext2_warning(sb, __FUNCTION__, "busy inodes while remounting "\
  1180 + ext2_warning(sb, __func__, "busy inodes while remounting "\
1181 1181 "xip remain in cache (no functional problem)");
1182 1182 if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
1183 1183 return 0;
... ... @@ -68,7 +68,7 @@
68 68 if ((sbi->s_mount_opt & EXT2_MOUNT_XIP) &&
69 69 !sb->s_bdev->bd_disk->fops->direct_access) {
70 70 sbi->s_mount_opt &= (~EXT2_MOUNT_XIP);
71   - ext2_warning(sb, __FUNCTION__,
  71 + ext2_warning(sb, __func__,
72 72 "ignoring xip option - not supported by bdev");
73 73 }
74 74 }