diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-28 05:16:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:45 -0400 |
commit | e05b6b524bd5c5c2bae1b64a7cbe08d46d57a6fe (patch) | |
tree | e5b5a7dbc57ccf8f6e425b7cb77249fdc534baca /fs/ext3/super.c | |
parent | fa1ff1e02fee908dfdc3f92902d39acc38041e4c (diff) |
ext3: 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: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ext3/super.c')
-rw-r--r-- | fs/ext3/super.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 6303adfbdae4..fe3119a71ada 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
@@ -84,7 +84,7 @@ handle_t *ext3_journal_start_sb(struct super_block *sb, int nblocks) | |||
84 | * take the FS itself readonly cleanly. */ | 84 | * take the FS itself readonly cleanly. */ |
85 | journal = EXT3_SB(sb)->s_journal; | 85 | journal = EXT3_SB(sb)->s_journal; |
86 | if (is_journal_aborted(journal)) { | 86 | if (is_journal_aborted(journal)) { |
87 | ext3_abort(sb, __FUNCTION__, | 87 | ext3_abort(sb, __func__, |
88 | "Detected aborted journal"); | 88 | "Detected aborted journal"); |
89 | return ERR_PTR(-EROFS); | 89 | return ERR_PTR(-EROFS); |
90 | } | 90 | } |
@@ -304,7 +304,7 @@ void ext3_update_dynamic_rev(struct super_block *sb) | |||
304 | if (le32_to_cpu(es->s_rev_level) > EXT3_GOOD_OLD_REV) | 304 | if (le32_to_cpu(es->s_rev_level) > EXT3_GOOD_OLD_REV) |
305 | return; | 305 | return; |
306 | 306 | ||
307 | ext3_warning(sb, __FUNCTION__, | 307 | ext3_warning(sb, __func__, |
308 | "updating to rev %d because of new feature flag, " | 308 | "updating to rev %d because of new feature flag, " |
309 | "running e2fsck is recommended", | 309 | "running e2fsck is recommended", |
310 | EXT3_DYNAMIC_REV); | 310 | EXT3_DYNAMIC_REV); |
@@ -1390,7 +1390,7 @@ static void ext3_orphan_cleanup (struct super_block * sb, | |||
1390 | if (inode->i_nlink) { | 1390 | if (inode->i_nlink) { |
1391 | printk(KERN_DEBUG | 1391 | printk(KERN_DEBUG |
1392 | "%s: truncating inode %lu to %Ld bytes\n", | 1392 | "%s: truncating inode %lu to %Ld bytes\n", |
1393 | __FUNCTION__, inode->i_ino, inode->i_size); | 1393 | __func__, inode->i_ino, inode->i_size); |
1394 | jbd_debug(2, "truncating inode %lu to %Ld bytes\n", | 1394 | jbd_debug(2, "truncating inode %lu to %Ld bytes\n", |
1395 | inode->i_ino, inode->i_size); | 1395 | inode->i_ino, inode->i_size); |
1396 | ext3_truncate(inode); | 1396 | ext3_truncate(inode); |
@@ -1398,7 +1398,7 @@ static void ext3_orphan_cleanup (struct super_block * sb, | |||
1398 | } else { | 1398 | } else { |
1399 | printk(KERN_DEBUG | 1399 | printk(KERN_DEBUG |
1400 | "%s: deleting unreferenced inode %lu\n", | 1400 | "%s: deleting unreferenced inode %lu\n", |
1401 | __FUNCTION__, inode->i_ino); | 1401 | __func__, inode->i_ino); |
1402 | jbd_debug(2, "deleting unreferenced inode %lu\n", | 1402 | jbd_debug(2, "deleting unreferenced inode %lu\n", |
1403 | inode->i_ino); | 1403 | inode->i_ino); |
1404 | nr_orphans++; | 1404 | nr_orphans++; |
@@ -2301,9 +2301,9 @@ static void ext3_clear_journal_err(struct super_block * sb, | |||
2301 | char nbuf[16]; | 2301 | char nbuf[16]; |
2302 | 2302 | ||
2303 | errstr = ext3_decode_error(sb, j_errno, nbuf); | 2303 | errstr = ext3_decode_error(sb, j_errno, nbuf); |
2304 | ext3_warning(sb, __FUNCTION__, "Filesystem error recorded " | 2304 | ext3_warning(sb, __func__, "Filesystem error recorded " |
2305 | "from previous mount: %s", errstr); | 2305 | "from previous mount: %s", errstr); |
2306 | ext3_warning(sb, __FUNCTION__, "Marking fs in need of " | 2306 | ext3_warning(sb, __func__, "Marking fs in need of " |
2307 | "filesystem check."); | 2307 | "filesystem check."); |
2308 | 2308 | ||
2309 | EXT3_SB(sb)->s_mount_state |= EXT3_ERROR_FS; | 2309 | EXT3_SB(sb)->s_mount_state |= EXT3_ERROR_FS; |
@@ -2430,7 +2430,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) | |||
2430 | } | 2430 | } |
2431 | 2431 | ||
2432 | if (sbi->s_mount_opt & EXT3_MOUNT_ABORT) | 2432 | if (sbi->s_mount_opt & EXT3_MOUNT_ABORT) |
2433 | ext3_abort(sb, __FUNCTION__, "Abort forced by user"); | 2433 | ext3_abort(sb, __func__, "Abort forced by user"); |
2434 | 2434 | ||
2435 | sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | | 2435 | sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | |
2436 | ((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); | 2436 | ((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); |