diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-30 03:55:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:54 -0400 |
commit | 8e24eea728068bbeb6a3c500b848f883a20bf225 (patch) | |
tree | 93e79da649723e2766237505b22725fec395f139 /fs/jffs2/xattr.c | |
parent | 530b6412786d7f83592c1a8e2445541ed73fca76 (diff) |
fs: 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>
Diffstat (limited to 'fs/jffs2/xattr.c')
-rw-r--r-- | fs/jffs2/xattr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c index e48665984cb3..574cb7532d6c 100644 --- a/fs/jffs2/xattr.c +++ b/fs/jffs2/xattr.c | |||
@@ -82,7 +82,7 @@ static int is_xattr_datum_unchecked(struct jffs2_sb_info *c, struct jffs2_xattr_ | |||
82 | static void unload_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd) | 82 | static void unload_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd) |
83 | { | 83 | { |
84 | /* must be called under down_write(xattr_sem) */ | 84 | /* must be called under down_write(xattr_sem) */ |
85 | D1(dbg_xattr("%s: xid=%u, version=%u\n", __FUNCTION__, xd->xid, xd->version)); | 85 | D1(dbg_xattr("%s: xid=%u, version=%u\n", __func__, xd->xid, xd->version)); |
86 | if (xd->xname) { | 86 | if (xd->xname) { |
87 | c->xdatum_mem_usage -= (xd->name_len + 1 + xd->value_len); | 87 | c->xdatum_mem_usage -= (xd->name_len + 1 + xd->value_len); |
88 | kfree(xd->xname); | 88 | kfree(xd->xname); |
@@ -1252,7 +1252,7 @@ int jffs2_garbage_collect_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ | |||
1252 | rc = jffs2_reserve_space_gc(c, totlen, &length, JFFS2_SUMMARY_XREF_SIZE); | 1252 | rc = jffs2_reserve_space_gc(c, totlen, &length, JFFS2_SUMMARY_XREF_SIZE); |
1253 | if (rc) { | 1253 | if (rc) { |
1254 | JFFS2_WARNING("%s: jffs2_reserve_space_gc() = %d, request = %u\n", | 1254 | JFFS2_WARNING("%s: jffs2_reserve_space_gc() = %d, request = %u\n", |
1255 | __FUNCTION__, rc, totlen); | 1255 | __func__, rc, totlen); |
1256 | rc = rc ? rc : -EBADFD; | 1256 | rc = rc ? rc : -EBADFD; |
1257 | goto out; | 1257 | goto out; |
1258 | } | 1258 | } |