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/xattr.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/xattr.c')
-rw-r--r-- | fs/ext3/xattr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c index ca591ad1540d..d4a4f0e9ff69 100644 --- a/fs/ext3/xattr.c +++ b/fs/ext3/xattr.c | |||
@@ -234,7 +234,7 @@ ext3_xattr_block_get(struct inode *inode, int name_index, const char *name, | |||
234 | ea_bdebug(bh, "b_count=%d, refcount=%d", | 234 | ea_bdebug(bh, "b_count=%d, refcount=%d", |
235 | atomic_read(&(bh->b_count)), le32_to_cpu(BHDR(bh)->h_refcount)); | 235 | atomic_read(&(bh->b_count)), le32_to_cpu(BHDR(bh)->h_refcount)); |
236 | if (ext3_xattr_check_block(bh)) { | 236 | if (ext3_xattr_check_block(bh)) { |
237 | bad_block: ext3_error(inode->i_sb, __FUNCTION__, | 237 | bad_block: ext3_error(inode->i_sb, __func__, |
238 | "inode %lu: bad block "E3FSBLK, inode->i_ino, | 238 | "inode %lu: bad block "E3FSBLK, inode->i_ino, |
239 | EXT3_I(inode)->i_file_acl); | 239 | EXT3_I(inode)->i_file_acl); |
240 | error = -EIO; | 240 | error = -EIO; |
@@ -376,7 +376,7 @@ ext3_xattr_block_list(struct inode *inode, char *buffer, size_t buffer_size) | |||
376 | ea_bdebug(bh, "b_count=%d, refcount=%d", | 376 | ea_bdebug(bh, "b_count=%d, refcount=%d", |
377 | atomic_read(&(bh->b_count)), le32_to_cpu(BHDR(bh)->h_refcount)); | 377 | atomic_read(&(bh->b_count)), le32_to_cpu(BHDR(bh)->h_refcount)); |
378 | if (ext3_xattr_check_block(bh)) { | 378 | if (ext3_xattr_check_block(bh)) { |
379 | ext3_error(inode->i_sb, __FUNCTION__, | 379 | ext3_error(inode->i_sb, __func__, |
380 | "inode %lu: bad block "E3FSBLK, inode->i_ino, | 380 | "inode %lu: bad block "E3FSBLK, inode->i_ino, |
381 | EXT3_I(inode)->i_file_acl); | 381 | EXT3_I(inode)->i_file_acl); |
382 | error = -EIO; | 382 | error = -EIO; |
@@ -651,7 +651,7 @@ ext3_xattr_block_find(struct inode *inode, struct ext3_xattr_info *i, | |||
651 | atomic_read(&(bs->bh->b_count)), | 651 | atomic_read(&(bs->bh->b_count)), |
652 | le32_to_cpu(BHDR(bs->bh)->h_refcount)); | 652 | le32_to_cpu(BHDR(bs->bh)->h_refcount)); |
653 | if (ext3_xattr_check_block(bs->bh)) { | 653 | if (ext3_xattr_check_block(bs->bh)) { |
654 | ext3_error(sb, __FUNCTION__, | 654 | ext3_error(sb, __func__, |
655 | "inode %lu: bad block "E3FSBLK, inode->i_ino, | 655 | "inode %lu: bad block "E3FSBLK, inode->i_ino, |
656 | EXT3_I(inode)->i_file_acl); | 656 | EXT3_I(inode)->i_file_acl); |
657 | error = -EIO; | 657 | error = -EIO; |
@@ -852,7 +852,7 @@ cleanup_dquot: | |||
852 | goto cleanup; | 852 | goto cleanup; |
853 | 853 | ||
854 | bad_block: | 854 | bad_block: |
855 | ext3_error(inode->i_sb, __FUNCTION__, | 855 | ext3_error(inode->i_sb, __func__, |
856 | "inode %lu: bad block "E3FSBLK, inode->i_ino, | 856 | "inode %lu: bad block "E3FSBLK, inode->i_ino, |
857 | EXT3_I(inode)->i_file_acl); | 857 | EXT3_I(inode)->i_file_acl); |
858 | goto cleanup; | 858 | goto cleanup; |
@@ -1081,14 +1081,14 @@ ext3_xattr_delete_inode(handle_t *handle, struct inode *inode) | |||
1081 | goto cleanup; | 1081 | goto cleanup; |
1082 | bh = sb_bread(inode->i_sb, EXT3_I(inode)->i_file_acl); | 1082 | bh = sb_bread(inode->i_sb, EXT3_I(inode)->i_file_acl); |
1083 | if (!bh) { | 1083 | if (!bh) { |
1084 | ext3_error(inode->i_sb, __FUNCTION__, | 1084 | ext3_error(inode->i_sb, __func__, |
1085 | "inode %lu: block "E3FSBLK" read error", inode->i_ino, | 1085 | "inode %lu: block "E3FSBLK" read error", inode->i_ino, |
1086 | EXT3_I(inode)->i_file_acl); | 1086 | EXT3_I(inode)->i_file_acl); |
1087 | goto cleanup; | 1087 | goto cleanup; |
1088 | } | 1088 | } |
1089 | if (BHDR(bh)->h_magic != cpu_to_le32(EXT3_XATTR_MAGIC) || | 1089 | if (BHDR(bh)->h_magic != cpu_to_le32(EXT3_XATTR_MAGIC) || |
1090 | BHDR(bh)->h_blocks != cpu_to_le32(1)) { | 1090 | BHDR(bh)->h_blocks != cpu_to_le32(1)) { |
1091 | ext3_error(inode->i_sb, __FUNCTION__, | 1091 | ext3_error(inode->i_sb, __func__, |
1092 | "inode %lu: bad block "E3FSBLK, inode->i_ino, | 1092 | "inode %lu: bad block "E3FSBLK, inode->i_ino, |
1093 | EXT3_I(inode)->i_file_acl); | 1093 | EXT3_I(inode)->i_file_acl); |
1094 | goto cleanup; | 1094 | goto cleanup; |
@@ -1215,7 +1215,7 @@ again: | |||
1215 | } | 1215 | } |
1216 | bh = sb_bread(inode->i_sb, ce->e_block); | 1216 | bh = sb_bread(inode->i_sb, ce->e_block); |
1217 | if (!bh) { | 1217 | if (!bh) { |
1218 | ext3_error(inode->i_sb, __FUNCTION__, | 1218 | ext3_error(inode->i_sb, __func__, |
1219 | "inode %lu: block %lu read error", | 1219 | "inode %lu: block %lu read error", |
1220 | inode->i_ino, (unsigned long) ce->e_block); | 1220 | inode->i_ino, (unsigned long) ce->e_block); |
1221 | } else if (le32_to_cpu(BHDR(bh)->h_refcount) >= | 1221 | } else if (le32_to_cpu(BHDR(bh)->h_refcount) >= |