diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-09 22:19:21 -0400 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-04-17 21:51:26 -0400 |
commit | 34a622b2e1c8e11c8990184634f101c1aad42fec (patch) | |
tree | 4a82ae6c61bf5d4cf90b931a84362b154e04184d /fs/xfs/xfs_bmap.c | |
parent | 0225da1f35df46c67785eb08526995d7cdb4e3b0 (diff) |
[XFS] replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30775a
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_bmap.c')
-rw-r--r-- | fs/xfs/xfs_bmap.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index 7d683e0b8ef7..65b8fa83e078 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c | |||
@@ -323,13 +323,13 @@ xfs_bmap_trace_pre_update( | |||
323 | int whichfork); /* data or attr fork */ | 323 | int whichfork); /* data or attr fork */ |
324 | 324 | ||
325 | #define XFS_BMAP_TRACE_DELETE(d,ip,i,c,w) \ | 325 | #define XFS_BMAP_TRACE_DELETE(d,ip,i,c,w) \ |
326 | xfs_bmap_trace_delete(__FUNCTION__,d,ip,i,c,w) | 326 | xfs_bmap_trace_delete(__func__,d,ip,i,c,w) |
327 | #define XFS_BMAP_TRACE_INSERT(d,ip,i,c,r1,r2,w) \ | 327 | #define XFS_BMAP_TRACE_INSERT(d,ip,i,c,r1,r2,w) \ |
328 | xfs_bmap_trace_insert(__FUNCTION__,d,ip,i,c,r1,r2,w) | 328 | xfs_bmap_trace_insert(__func__,d,ip,i,c,r1,r2,w) |
329 | #define XFS_BMAP_TRACE_POST_UPDATE(d,ip,i,w) \ | 329 | #define XFS_BMAP_TRACE_POST_UPDATE(d,ip,i,w) \ |
330 | xfs_bmap_trace_post_update(__FUNCTION__,d,ip,i,w) | 330 | xfs_bmap_trace_post_update(__func__,d,ip,i,w) |
331 | #define XFS_BMAP_TRACE_PRE_UPDATE(d,ip,i,w) \ | 331 | #define XFS_BMAP_TRACE_PRE_UPDATE(d,ip,i,w) \ |
332 | xfs_bmap_trace_pre_update(__FUNCTION__,d,ip,i,w) | 332 | xfs_bmap_trace_pre_update(__func__,d,ip,i,w) |
333 | #else | 333 | #else |
334 | #define XFS_BMAP_TRACE_DELETE(d,ip,i,c,w) | 334 | #define XFS_BMAP_TRACE_DELETE(d,ip,i,c,w) |
335 | #define XFS_BMAP_TRACE_INSERT(d,ip,i,c,r1,r2,w) | 335 | #define XFS_BMAP_TRACE_INSERT(d,ip,i,c,r1,r2,w) |
@@ -6164,10 +6164,10 @@ xfs_check_block( | |||
6164 | } | 6164 | } |
6165 | if (*thispa == *pp) { | 6165 | if (*thispa == *pp) { |
6166 | cmn_err(CE_WARN, "%s: thispa(%d) == pp(%d) %Ld", | 6166 | cmn_err(CE_WARN, "%s: thispa(%d) == pp(%d) %Ld", |
6167 | __FUNCTION__, j, i, | 6167 | __func__, j, i, |
6168 | (unsigned long long)be64_to_cpu(*thispa)); | 6168 | (unsigned long long)be64_to_cpu(*thispa)); |
6169 | panic("%s: ptrs are equal in node\n", | 6169 | panic("%s: ptrs are equal in node\n", |
6170 | __FUNCTION__); | 6170 | __func__); |
6171 | } | 6171 | } |
6172 | } | 6172 | } |
6173 | } | 6173 | } |
@@ -6324,13 +6324,13 @@ xfs_bmap_check_leaf_extents( | |||
6324 | return; | 6324 | return; |
6325 | 6325 | ||
6326 | error0: | 6326 | error0: |
6327 | cmn_err(CE_WARN, "%s: at error0", __FUNCTION__); | 6327 | cmn_err(CE_WARN, "%s: at error0", __func__); |
6328 | if (bp_release) | 6328 | if (bp_release) |
6329 | xfs_trans_brelse(NULL, bp); | 6329 | xfs_trans_brelse(NULL, bp); |
6330 | error_norelse: | 6330 | error_norelse: |
6331 | cmn_err(CE_WARN, "%s: BAD after btree leaves for %d extents", | 6331 | cmn_err(CE_WARN, "%s: BAD after btree leaves for %d extents", |
6332 | __FUNCTION__, i); | 6332 | __func__, i); |
6333 | panic("%s: CORRUPTED BTREE OR SOMETHING", __FUNCTION__); | 6333 | panic("%s: CORRUPTED BTREE OR SOMETHING", __func__); |
6334 | return; | 6334 | return; |
6335 | } | 6335 | } |
6336 | #endif | 6336 | #endif |