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/nfsd | |
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/nfsd')
-rw-r--r-- | fs/nfsd/nfs4callback.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 562abf3380d0..0b3ffa9840c2 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c | |||
@@ -104,7 +104,7 @@ xdr_writemem(__be32 *p, const void *ptr, int nbytes) | |||
104 | } while (0) | 104 | } while (0) |
105 | #define RESERVE_SPACE(nbytes) do { \ | 105 | #define RESERVE_SPACE(nbytes) do { \ |
106 | p = xdr_reserve_space(xdr, nbytes); \ | 106 | p = xdr_reserve_space(xdr, nbytes); \ |
107 | if (!p) dprintk("NFSD: RESERVE_SPACE(%d) failed in function %s\n", (int) (nbytes), __FUNCTION__); \ | 107 | if (!p) dprintk("NFSD: RESERVE_SPACE(%d) failed in function %s\n", (int) (nbytes), __func__); \ |
108 | BUG_ON(!p); \ | 108 | BUG_ON(!p); \ |
109 | } while (0) | 109 | } while (0) |
110 | 110 | ||
@@ -134,7 +134,7 @@ xdr_error: \ | |||
134 | p = xdr_inline_decode(xdr, nbytes); \ | 134 | p = xdr_inline_decode(xdr, nbytes); \ |
135 | if (!p) { \ | 135 | if (!p) { \ |
136 | dprintk("NFSD: %s: reply buffer overflowed in line %d.\n", \ | 136 | dprintk("NFSD: %s: reply buffer overflowed in line %d.\n", \ |
137 | __FUNCTION__, __LINE__); \ | 137 | __func__, __LINE__); \ |
138 | return -EIO; \ | 138 | return -EIO; \ |
139 | } \ | 139 | } \ |
140 | } while (0) | 140 | } while (0) |