diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-17 10:38:59 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2008-04-17 10:38:59 -0400 |
commit | 46e665e9d297525d286989640cf4247cbe941df6 (patch) | |
tree | 4858cd21e48cab2b2c51839dd80378f6044d3394 /fs/ext4/super.c | |
parent | 620de4e19890c623eb4ba293ec19b42e2e391b89 (diff) |
ext4: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r-- | fs/ext4/super.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 01d163964e69..93a7e746f425 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -135,7 +135,7 @@ handle_t *ext4_journal_start_sb(struct super_block *sb, int nblocks) | |||
135 | * take the FS itself readonly cleanly. */ | 135 | * take the FS itself readonly cleanly. */ |
136 | journal = EXT4_SB(sb)->s_journal; | 136 | journal = EXT4_SB(sb)->s_journal; |
137 | if (is_journal_aborted(journal)) { | 137 | if (is_journal_aborted(journal)) { |
138 | ext4_abort(sb, __FUNCTION__, | 138 | ext4_abort(sb, __func__, |
139 | "Detected aborted journal"); | 139 | "Detected aborted journal"); |
140 | return ERR_PTR(-EROFS); | 140 | return ERR_PTR(-EROFS); |
141 | } | 141 | } |
@@ -355,7 +355,7 @@ void ext4_update_dynamic_rev(struct super_block *sb) | |||
355 | if (le32_to_cpu(es->s_rev_level) > EXT4_GOOD_OLD_REV) | 355 | if (le32_to_cpu(es->s_rev_level) > EXT4_GOOD_OLD_REV) |
356 | return; | 356 | return; |
357 | 357 | ||
358 | ext4_warning(sb, __FUNCTION__, | 358 | ext4_warning(sb, __func__, |
359 | "updating to rev %d because of new feature flag, " | 359 | "updating to rev %d because of new feature flag, " |
360 | "running e2fsck is recommended", | 360 | "running e2fsck is recommended", |
361 | EXT4_DYNAMIC_REV); | 361 | EXT4_DYNAMIC_REV); |
@@ -1511,7 +1511,7 @@ static int ext4_check_descriptors(struct super_block *sb) | |||
1511 | return 0; | 1511 | return 0; |
1512 | } | 1512 | } |
1513 | if (!ext4_group_desc_csum_verify(sbi, i, gdp)) { | 1513 | if (!ext4_group_desc_csum_verify(sbi, i, gdp)) { |
1514 | ext4_error(sb, __FUNCTION__, | 1514 | ext4_error(sb, __func__, |
1515 | "Checksum for group %lu failed (%u!=%u)\n", | 1515 | "Checksum for group %lu failed (%u!=%u)\n", |
1516 | i, le16_to_cpu(ext4_group_desc_csum(sbi, i, | 1516 | i, le16_to_cpu(ext4_group_desc_csum(sbi, i, |
1517 | gdp)), le16_to_cpu(gdp->bg_checksum)); | 1517 | gdp)), le16_to_cpu(gdp->bg_checksum)); |
@@ -1605,7 +1605,7 @@ static void ext4_orphan_cleanup (struct super_block * sb, | |||
1605 | if (inode->i_nlink) { | 1605 | if (inode->i_nlink) { |
1606 | printk(KERN_DEBUG | 1606 | printk(KERN_DEBUG |
1607 | "%s: truncating inode %lu to %Ld bytes\n", | 1607 | "%s: truncating inode %lu to %Ld bytes\n", |
1608 | __FUNCTION__, inode->i_ino, inode->i_size); | 1608 | __func__, inode->i_ino, inode->i_size); |
1609 | jbd_debug(2, "truncating inode %lu to %Ld bytes\n", | 1609 | jbd_debug(2, "truncating inode %lu to %Ld bytes\n", |
1610 | inode->i_ino, inode->i_size); | 1610 | inode->i_ino, inode->i_size); |
1611 | ext4_truncate(inode); | 1611 | ext4_truncate(inode); |
@@ -1613,7 +1613,7 @@ static void ext4_orphan_cleanup (struct super_block * sb, | |||
1613 | } else { | 1613 | } else { |
1614 | printk(KERN_DEBUG | 1614 | printk(KERN_DEBUG |
1615 | "%s: deleting unreferenced inode %lu\n", | 1615 | "%s: deleting unreferenced inode %lu\n", |
1616 | __FUNCTION__, inode->i_ino); | 1616 | __func__, inode->i_ino); |
1617 | jbd_debug(2, "deleting unreferenced inode %lu\n", | 1617 | jbd_debug(2, "deleting unreferenced inode %lu\n", |
1618 | inode->i_ino); | 1618 | inode->i_ino); |
1619 | nr_orphans++; | 1619 | nr_orphans++; |
@@ -2699,9 +2699,9 @@ static void ext4_clear_journal_err(struct super_block * sb, | |||
2699 | char nbuf[16]; | 2699 | char nbuf[16]; |
2700 | 2700 | ||
2701 | errstr = ext4_decode_error(sb, j_errno, nbuf); | 2701 | errstr = ext4_decode_error(sb, j_errno, nbuf); |
2702 | ext4_warning(sb, __FUNCTION__, "Filesystem error recorded " | 2702 | ext4_warning(sb, __func__, "Filesystem error recorded " |
2703 | "from previous mount: %s", errstr); | 2703 | "from previous mount: %s", errstr); |
2704 | ext4_warning(sb, __FUNCTION__, "Marking fs in need of " | 2704 | ext4_warning(sb, __func__, "Marking fs in need of " |
2705 | "filesystem check."); | 2705 | "filesystem check."); |
2706 | 2706 | ||
2707 | EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS; | 2707 | EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS; |
@@ -2828,7 +2828,7 @@ static int ext4_remount (struct super_block * sb, int * flags, char * data) | |||
2828 | } | 2828 | } |
2829 | 2829 | ||
2830 | if (sbi->s_mount_opt & EXT4_MOUNT_ABORT) | 2830 | if (sbi->s_mount_opt & EXT4_MOUNT_ABORT) |
2831 | ext4_abort(sb, __FUNCTION__, "Abort forced by user"); | 2831 | ext4_abort(sb, __func__, "Abort forced by user"); |
2832 | 2832 | ||
2833 | sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | | 2833 | sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | |
2834 | ((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); | 2834 | ((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); |