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>

diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index c834f512dce5fc21026a2345ca6366d3092c2e77..25dec8633c948f16e15bf5660abbce75838b0a79 100644 (file)
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -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++;

diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c
index dd9dbb25eab2b2a64acdc8b999e94935b2676478..a78c6b4af06012a82c6a1ed3095b9ce4fc2e22fb 100644 (file)
--- a/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@ -295,7 +295,7 @@ ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
                struct page *page = ext2_get_page(inode, n);
 
                if (IS_ERR(page)) {
-                       ext2_error(sb, __FUNCTION__,
+                       ext2_error(sb, __func__,
                                   "bad page in #%lu",
                                   inode->i_ino);
                        filp->f_pos += PAGE_CACHE_SIZE - offset;
@@ -314,7 +314,7 @@ ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
                limit = kaddr + ext2_last_byte(inode, n) - EXT2_DIR_REC_LEN(1);
                for ( ;(char*)de <= limit; de = ext2_next_entry(de)) {
                        if (de->rec_len == 0) {
-                               ext2_error(sb, __FUNCTION__,
+                               ext2_error(sb, __func__,
                                        "zero-length directory entry");
                                ext2_put_page(page);
                                return -EIO;
@@ -381,7 +381,7 @@ struct ext2_dir_entry_2 * ext2_find_entry (struct inode * dir,
                        kaddr += ext2_last_byte(dir, n) - reclen;
                        while ((char *) de <= kaddr) {
                                if (de->rec_len == 0) {
-                                       ext2_error(dir->i_sb, __FUNCTION__,
+                                       ext2_error(dir->i_sb, __func__,
                                                "zero-length directory entry");
                                        ext2_put_page(page);
                                        goto out;
@@ -396,7 +396,7 @@ struct ext2_dir_entry_2 * ext2_find_entry (struct inode * dir,
                        n = 0;
                /* next page is past the blocks we've got */
                if (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) {
-                       ext2_error(dir->i_sb, __FUNCTION__,
+                       ext2_error(dir->i_sb, __func__,
                                "dir %lu size %lld exceeds block count %llu",
                                dir->i_ino, dir->i_size,
                                (unsigned long long)dir->i_blocks);
@@ -506,7 +506,7 @@ int ext2_add_link (struct dentry *dentry, struct inode *inode)
                                goto got_it;
                        }
                        if (de->rec_len == 0) {
-                               ext2_error(dir->i_sb, __FUNCTION__,
+                               ext2_error(dir->i_sb, __func__,
                                        "zero-length directory entry");
                                err = -EIO;
                                goto out_unlock;
@@ -578,7 +578,7 @@ int ext2_delete_entry (struct ext2_dir_entry_2 * dir, struct page * page )
 
        while ((char*)de < (char*)dir) {
                if (de->rec_len == 0) {
-                       ext2_error(inode->i_sb, __FUNCTION__,
+                       ext2_error(inode->i_sb, __func__,
                                "zero-length directory entry");
                        err = -EIO;
                        goto out;
@@ -670,7 +670,7 @@ int ext2_empty_dir (struct inode * inode)
 
                while ((char *)de <= kaddr) {
                        if (de->rec_len == 0) {
-                               ext2_error(inode->i_sb, __FUNCTION__,
+                               ext2_error(inode->i_sb, __func__,
                                        "zero-length directory entry");
                                printk("kaddr=%p, de=%p\n", kaddr, de);
                                goto not_empty;

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 3f745fb5fff33f4d978858ba8306967b01b2d419..ef50cbc792db94668b9d7deecc22c50076511fe4 100644 (file)
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -89,7 +89,7 @@ void ext2_update_dynamic_rev(struct super_block *sb)
        if (le32_to_cpu(es->s_rev_level) > EXT2_GOOD_OLD_REV)
                return;
 
-       ext2_warning(sb, __FUNCTION__,
+       ext2_warning(sb, __func__,
                     "updating to rev %d because of new feature flag, "
                     "running e2fsck is recommended",
                     EXT2_DYNAMIC_REV);
@@ -1060,7 +1060,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
                goto failed_mount3;
        }
        if (EXT2_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL))
-               ext2_warning(sb, __FUNCTION__,
+               ext2_warning(sb, __func__,
                        "mounting ext3 filesystem as ext2");
        ext2_setup_super (sb, es, sb->s_flags & MS_RDONLY);
        return 0;
@@ -1177,7 +1177,7 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data)
        if (((sbi->s_mount_opt & EXT2_MOUNT_XIP) !=
            (old_mount_opt & EXT2_MOUNT_XIP)) &&
            invalidate_inodes(sb))
-               ext2_warning(sb, __FUNCTION__, "busy inodes while remounting "\
+               ext2_warning(sb, __func__, "busy inodes while remounting "\
                             "xip remain in cache (no functional problem)");
        if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
                return 0;

diff --git a/fs/ext2/xip.c b/fs/ext2/xip.c
index 233f7fdbe31d7d323952d0389baf97182d2e6536..4fb94c20041b5e44c5ee2152a151bf65e486daa9 100644 (file)
--- a/fs/ext2/xip.c
+++ b/fs/ext2/xip.c
@@ -68,7 +68,7 @@ void ext2_xip_verify_sb(struct super_block *sb)
        if ((sbi->s_mount_opt & EXT2_MOUNT_XIP) &&
            !sb->s_bdev->bd_disk->fops->direct_access) {
                sbi->s_mount_opt &= (~EXT2_MOUNT_XIP);
-               ext2_warning(sb, __FUNCTION__,
+               ext2_warning(sb, __func__,
                             "ignoring xip option - not supported by bdev");
        }
 }