Skip to content

L
linux
Commit 3a59c94c authored by Eric Sandeen's avatar Eric Sandeen Committed by Tim Shimmin
Browse files
Options

[XFS] Clean up function name handling in tracing code 

Remove the hardcoded "fnames" for tracing, and just embed them in tracing
macros via __FUNCTION__. Kills a lot of #ifdefs too.

SGI-PV: 967353
SGI-Modid: xfs-linux-melb:xfs-kern:29099a
Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent b11f94d5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 273 deletions
fs/xfs/xfs_alloc.c
View file @ 3a59c94c
...@@ -55,17 +55,17 @@ xfs_alloc_search_busy(xfs_trans_t *tp, ...@@ -55,17 +55,17 @@ xfs_alloc_search_busy(xfs_trans_t *tp,
ktrace_t *xfs_alloc_trace_buf; ktrace_t *xfs_alloc_trace_buf;
#define TRACE_ALLOC(s,a) \ #define TRACE_ALLOC(s,a) \
xfs_alloc_trace_alloc(fname, s, a, __LINE__) xfs_alloc_trace_alloc(__FUNCTION__, s, a, __LINE__)
#define TRACE_FREE(s,a,b,x,f) \ #define TRACE_FREE(s,a,b,x,f) \
xfs_alloc_trace_free(fname, s, mp, a, b, x, f, __LINE__) xfs_alloc_trace_free(__FUNCTION__, s, mp, a, b, x, f, __LINE__)
#define TRACE_MODAGF(s,a,f) \ #define TRACE_MODAGF(s,a,f) \
xfs_alloc_trace_modagf(fname, s, mp, a, f, __LINE__) xfs_alloc_trace_modagf(__FUNCTION__, s, mp, a, f, __LINE__)
#define TRACE_BUSY(fname,s,ag,agb,l,sl,tp) \ #define TRACE_BUSY(__FUNCTION__,s,ag,agb,l,sl,tp) \
xfs_alloc_trace_busy(fname, s, mp, ag, agb, l, sl, tp, XFS_ALLOC_KTRACE_BUSY, __LINE__) xfs_alloc_trace_busy(__FUNCTION__, s, mp, ag, agb, l, sl, tp, XFS_ALLOC_KTRACE_BUSY, __LINE__)
#define TRACE_UNBUSY(fname,s,ag,sl,tp) \ #define TRACE_UNBUSY(__FUNCTION__,s,ag,sl,tp) \
xfs_alloc_trace_busy(fname, s, mp, ag, -1, -1, sl, tp, XFS_ALLOC_KTRACE_UNBUSY, __LINE__) xfs_alloc_trace_busy(__FUNCTION__, s, mp, ag, -1, -1, sl, tp, XFS_ALLOC_KTRACE_UNBUSY, __LINE__)
#define TRACE_BUSYSEARCH(fname,s,ag,agb,l,sl,tp) \ #define TRACE_BUSYSEARCH(__FUNCTION__,s,ag,agb,l,sl,tp) \
xfs_alloc_trace_busy(fname, s, mp, ag, agb, l, sl, tp, XFS_ALLOC_KTRACE_BUSYSEARCH, __LINE__) xfs_alloc_trace_busy(__FUNCTION__, s, mp, ag, agb, l, sl, tp, XFS_ALLOC_KTRACE_BUSYSEARCH, __LINE__)
#else #else
#define TRACE_ALLOC(s,a) #define TRACE_ALLOC(s,a)
#define TRACE_FREE(s,a,b,x,f) #define TRACE_FREE(s,a,b,x,f)
...@@ -420,7 +420,7 @@ xfs_alloc_read_agfl( ...@@ -420,7 +420,7 @@ xfs_alloc_read_agfl(
*/ */
STATIC void STATIC void
xfs_alloc_trace_alloc( xfs_alloc_trace_alloc(
char *name, /* function tag string */ const char *name, /* function tag string */
char *str, /* additional string */ char *str, /* additional string */
xfs_alloc_arg_t *args, /* allocation argument structure */ xfs_alloc_arg_t *args, /* allocation argument structure */
int line) /* source line number */ int line) /* source line number */
...@@ -453,7 +453,7 @@ xfs_alloc_trace_alloc( ...@@ -453,7 +453,7 @@ xfs_alloc_trace_alloc(
*/ */
STATIC void STATIC void
xfs_alloc_trace_free( xfs_alloc_trace_free(
char *name, /* function tag string */ const char *name, /* function tag string */
char *str, /* additional string */ char *str, /* additional string */
xfs_mount_t *mp, /* file system mount point */ xfs_mount_t *mp, /* file system mount point */
xfs_agnumber_t agno, /* allocation group number */ xfs_agnumber_t agno, /* allocation group number */
...@@ -479,7 +479,7 @@ xfs_alloc_trace_free( ...@@ -479,7 +479,7 @@ xfs_alloc_trace_free(
*/ */
STATIC void STATIC void
xfs_alloc_trace_modagf( xfs_alloc_trace_modagf(
char *name, /* function tag string */ const char *name, /* function tag string */
char *str, /* additional string */ char *str, /* additional string */
xfs_mount_t *mp, /* file system mount point */ xfs_mount_t *mp, /* file system mount point */
xfs_agf_t *agf, /* new agf value */ xfs_agf_t *agf, /* new agf value */
...@@ -507,7 +507,7 @@ xfs_alloc_trace_modagf( ...@@ -507,7 +507,7 @@ xfs_alloc_trace_modagf(
STATIC void STATIC void
xfs_alloc_trace_busy( xfs_alloc_trace_busy(
char *name, /* function tag string */ const char *name, /* function tag string */
char *str, /* additional string */ char *str, /* additional string */
xfs_mount_t *mp, /* file system mount point */ xfs_mount_t *mp, /* file system mount point */
xfs_agnumber_t agno, /* allocation group number */ xfs_agnumber_t agno, /* allocation group number */
...@@ -549,9 +549,6 @@ xfs_alloc_ag_vextent( ...@@ -549,9 +549,6 @@ xfs_alloc_ag_vextent(
xfs_alloc_arg_t *args) /* argument structure for allocation */ xfs_alloc_arg_t *args) /* argument structure for allocation */
{ {
int error=0; int error=0;
#ifdef XFS_ALLOC_TRACE
static char fname[] = "xfs_alloc_ag_vextent";
#endif
ASSERT(args->minlen > 0); ASSERT(args->minlen > 0);
ASSERT(args->maxlen > 0); ASSERT(args->maxlen > 0);
...@@ -635,9 +632,6 @@ xfs_alloc_ag_vextent_exact( ...@@ -635,9 +632,6 @@ xfs_alloc_ag_vextent_exact(
xfs_agblock_t fbno; /* start block of found extent */ xfs_agblock_t fbno; /* start block of found extent */
xfs_agblock_t fend; /* end block of found extent */ xfs_agblock_t fend; /* end block of found extent */
xfs_extlen_t flen; /* length of found extent */ xfs_extlen_t flen; /* length of found extent */
#ifdef XFS_ALLOC_TRACE
static char fname[] = "xfs_alloc_ag_vextent_exact";
#endif
int i; /* success/failure of operation */ int i; /* success/failure of operation */
xfs_agblock_t maxend; /* end of maximal extent */ xfs_agblock_t maxend; /* end of maximal extent */
xfs_agblock_t minend; /* end of minimal extent */ xfs_agblock_t minend; /* end of minimal extent */
...@@ -737,9 +731,6 @@ xfs_alloc_ag_vextent_near( ...@@ -737,9 +731,6 @@ xfs_alloc_ag_vextent_near(
xfs_btree_cur_t *bno_cur_gt; /* cursor for bno btree, right side */ xfs_btree_cur_t *bno_cur_gt; /* cursor for bno btree, right side */
xfs_btree_cur_t *bno_cur_lt; /* cursor for bno btree, left side */ xfs_btree_cur_t *bno_cur_lt; /* cursor for bno btree, left side */
xfs_btree_cur_t *cnt_cur; /* cursor for count btree */ xfs_btree_cur_t *cnt_cur; /* cursor for count btree */
#ifdef XFS_ALLOC_TRACE
static char fname[] = "xfs_alloc_ag_vextent_near";
#endif
xfs_agblock_t gtbno; /* start bno of right side entry */ xfs_agblock_t gtbno; /* start bno of right side entry */
xfs_agblock_t gtbnoa; /* aligned ... */ xfs_agblock_t gtbnoa; /* aligned ... */
xfs_extlen_t gtdiff; /* difference to right side entry */ xfs_extlen_t gtdiff; /* difference to right side entry */
...@@ -1270,9 +1261,6 @@ xfs_alloc_ag_vextent_size( ...@@ -1270,9 +1261,6 @@ xfs_alloc_ag_vextent_size(
int error; /* error result */ int error; /* error result */
xfs_agblock_t fbno; /* start of found freespace */ xfs_agblock_t fbno; /* start of found freespace */
xfs_extlen_t flen; /* length of found freespace */ xfs_extlen_t flen; /* length of found freespace */
#ifdef XFS_ALLOC_TRACE
static char fname[] = "xfs_alloc_ag_vextent_size";
#endif
int i; /* temp status variable */ int i; /* temp status variable */
xfs_agblock_t rbno; /* returned block number */ xfs_agblock_t rbno; /* returned block number */
xfs_extlen_t rlen; /* length of returned extent */ xfs_extlen_t rlen; /* length of returned extent */
...@@ -1427,9 +1415,6 @@ xfs_alloc_ag_vextent_small( ...@@ -1427,9 +1415,6 @@ xfs_alloc_ag_vextent_small(
int error; int error;
xfs_agblock_t fbno; xfs_agblock_t fbno;
xfs_extlen_t flen; xfs_extlen_t flen;
#ifdef XFS_ALLOC_TRACE
static char fname[] = "xfs_alloc_ag_vextent_small";
#endif
int i; int i;
if ((error = xfs_alloc_decrement(ccur, 0, &i))) if ((error = xfs_alloc_decrement(ccur, 0, &i)))
...@@ -1516,9 +1501,6 @@ xfs_free_ag_extent( ...@@ -1516,9 +1501,6 @@ xfs_free_ag_extent(
xfs_btree_cur_t *bno_cur; /* cursor for by-block btree */ xfs_btree_cur_t *bno_cur; /* cursor for by-block btree */
xfs_btree_cur_t *cnt_cur; /* cursor for by-size btree */ xfs_btree_cur_t *cnt_cur; /* cursor for by-size btree */
int error; /* error return value */ int error; /* error return value */
#ifdef XFS_ALLOC_TRACE
static char fname[] = "xfs_free_ag_extent";
#endif
xfs_agblock_t gtbno; /* start of right neighbor block */ xfs_agblock_t gtbno; /* start of right neighbor block */
xfs_extlen_t gtlen; /* length of right neighbor block */ xfs_extlen_t gtlen; /* length of right neighbor block */
int haveleft; /* have a left neighbor block */ int haveleft; /* have a left neighbor block */
...@@ -2003,9 +1985,6 @@ xfs_alloc_get_freelist( ...@@ -2003,9 +1985,6 @@ xfs_alloc_get_freelist(
xfs_agblock_t bno; /* block number returned */ xfs_agblock_t bno; /* block number returned */
int error; int error;
int logflags; int logflags;
#ifdef XFS_ALLOC_TRACE
static char fname[] = "xfs_alloc_get_freelist";
#endif
xfs_mount_t *mp; /* mount structure */ xfs_mount_t *mp; /* mount structure */
xfs_perag_t *pag; /* per allocation group data */ xfs_perag_t *pag; /* per allocation group data */
...@@ -2128,9 +2107,6 @@ xfs_alloc_put_freelist( ...@@ -2128,9 +2107,6 @@ xfs_alloc_put_freelist(
__be32 *blockp;/* pointer to array entry */ __be32 *blockp;/* pointer to array entry */
int error; int error;
int logflags; int logflags;
#ifdef XFS_ALLOC_TRACE
static char fname[] = "xfs_alloc_put_freelist";
#endif
xfs_mount_t *mp; /* mount structure */ xfs_mount_t *mp; /* mount structure */
xfs_perag_t *pag; /* per allocation group data */ xfs_perag_t *pag; /* per allocation group data */
...@@ -2263,9 +2239,6 @@ xfs_alloc_vextent( ...@@ -2263,9 +2239,6 @@ xfs_alloc_vextent(
xfs_agblock_t agsize; /* allocation group size */ xfs_agblock_t agsize; /* allocation group size */
int error; int error;
int flags; /* XFS_ALLOC_FLAG_... locking flags */ int flags; /* XFS_ALLOC_FLAG_... locking flags */
#ifdef XFS_ALLOC_TRACE
static char fname[] = "xfs_alloc_vextent";
#endif
xfs_extlen_t minleft;/* minimum left value, temp copy */ xfs_extlen_t minleft;/* minimum left value, temp copy */
xfs_mount_t *mp; /* mount structure pointer */ xfs_mount_t *mp; /* mount structure pointer */
xfs_agnumber_t sagno; /* starting allocation group number */ xfs_agnumber_t sagno; /* starting allocation group number */
......
fs/xfs/xfs_bmap.c
View file @ 3a59c94c
This diff is collapsed.
fs/xfs/xfs_bmap.h
View file @ 3a59c94c
...@@ -144,12 +144,14 @@ extern ktrace_t *xfs_bmap_trace_buf; ...@@ -144,12 +144,14 @@ extern ktrace_t *xfs_bmap_trace_buf;
*/ */
void void
xfs_bmap_trace_exlist( xfs_bmap_trace_exlist(
char *fname, /* function name */ const char *fname, /* function name */
struct xfs_inode *ip, /* incore inode pointer */ struct xfs_inode *ip, /* incore inode pointer */
xfs_extnum_t cnt, /* count of entries in list */ xfs_extnum_t cnt, /* count of entries in list */
int whichfork); /* data or attr fork */ int whichfork); /* data or attr fork */
#define XFS_BMAP_TRACE_EXLIST(ip,c,w) \
xfs_bmap_trace_exlist(__FUNCTION__,ip,c,w)
#else #else
#define xfs_bmap_trace_exlist(f,ip,c,w) #define XFS_BMAP_TRACE_EXLIST(ip,c,w)
#endif #endif
/* /*
......
fs/xfs/xfs_bmap_btree.c
View file @ 3a59c94c
...@@ -76,7 +76,7 @@ static char EXIT[] = "exit"; ...@@ -76,7 +76,7 @@ static char EXIT[] = "exit";
*/ */
STATIC void STATIC void
xfs_bmbt_trace_enter( xfs_bmbt_trace_enter(
char *func, const char *func,
xfs_btree_cur_t *cur, xfs_btree_cur_t *cur,
char *s, char *s,
int type, int type,
...@@ -117,7 +117,7 @@ xfs_bmbt_trace_enter( ...@@ -117,7 +117,7 @@ xfs_bmbt_trace_enter(
*/ */
STATIC void STATIC void
xfs_bmbt_trace_argbi( xfs_bmbt_trace_argbi(
char *func, const char *func,
xfs_btree_cur_t *cur, xfs_btree_cur_t *cur,
xfs_buf_t *b, xfs_buf_t *b,
int i, int i,
...@@ -134,7 +134,7 @@ xfs_bmbt_trace_argbi( ...@@ -134,7 +134,7 @@ xfs_bmbt_trace_argbi(
*/ */
STATIC void STATIC void
xfs_bmbt_trace_argbii( xfs_bmbt_trace_argbii(
char *func, const char *func,
xfs_btree_cur_t *cur, xfs_btree_cur_t *cur,
xfs_buf_t *b, xfs_buf_t *b,
int i0, int i0,
...@@ -153,7 +153,7 @@ xfs_bmbt_trace_argbii( ...@@ -153,7 +153,7 @@ xfs_bmbt_trace_argbii(
*/ */
STATIC void STATIC void
xfs_bmbt_trace_argfffi( xfs_bmbt_trace_argfffi(
char *func, const char *func,
xfs_btree_cur_t *cur, xfs_btree_cur_t *cur,
xfs_dfiloff_t o, xfs_dfiloff_t o,
xfs_dfsbno_t b, xfs_dfsbno_t b,
...@@ -172,7 +172,7 @@ xfs_bmbt_trace_argfffi( ...@@ -172,7 +172,7 @@ xfs_bmbt_trace_argfffi(
*/ */
STATIC void STATIC void
xfs_bmbt_trace_argi( xfs_bmbt_trace_argi(
char *func, const char *func,
xfs_btree_cur_t *cur, xfs_btree_cur_t *cur,
int i, int i,
int line) int line)
...@@ -188,7 +188,7 @@ xfs_bmbt_trace_argi( ...@@ -188,7 +188,7 @@ xfs_bmbt_trace_argi(
*/ */
STATIC void STATIC void
xfs_bmbt_trace_argifk( xfs_bmbt_trace_argifk(
char *func, const char *func,
xfs_btree_cur_t *cur, xfs_btree_cur_t *cur,
int i, int i,
xfs_fsblock_t f, xfs_fsblock_t f,
...@@ -206,7 +206,7 @@ xfs_bmbt_trace_argifk( ...@@ -206,7 +206,7 @@ xfs_bmbt_trace_argifk(
*/ */
STATIC void STATIC void
xfs_bmbt_trace_argifr( xfs_bmbt_trace_argifr(
char *func, const char *func,
xfs_btree_cur_t *cur, xfs_btree_cur_t *cur,
int i, int i,
xfs_fsblock_t f, xfs_fsblock_t f,
...@@ -235,7 +235,7 @@ xfs_bmbt_trace_argifr( ...@@ -235,7 +235,7 @@ xfs_bmbt_trace_argifr(
*/ */
STATIC void STATIC void
xfs_bmbt_trace_argik( xfs_bmbt_trace_argik(
char *func, const char *func,
xfs_btree_cur_t *cur, xfs_btree_cur_t *cur,
int i, int i,
xfs_bmbt_key_t *k, xfs_bmbt_key_t *k,
...@@ -255,7 +255,7 @@ xfs_bmbt_trace_argik( ...@@ -255,7 +255,7 @@ xfs_bmbt_trace_argik(
*/ */
STATIC void STATIC void
xfs_bmbt_trace_cursor( xfs_bmbt_trace_cursor(
char *func, const char *func,
xfs_btree_cur_t *cur, xfs_btree_cur_t *cur,
char *s, char *s,
int line) int line)
...@@ -274,21 +274,21 @@ xfs_bmbt_trace_cursor( ...@@ -274,21 +274,21 @@ xfs_bmbt_trace_cursor(
} }
#define XFS_BMBT_TRACE_ARGBI(c,b,i) \ #define XFS_BMBT_TRACE_ARGBI(c,b,i) \
xfs_bmbt_trace_argbi(fname, c, b, i, __LINE__) xfs_bmbt_trace_argbi(__FUNCTION__, c, b, i, __LINE__)
#define XFS_BMBT_TRACE_ARGBII(c,b,i,j) \ #define XFS_BMBT_TRACE_ARGBII(c,b,i,j) \
xfs_bmbt_trace_argbii(fname, c, b, i, j, __LINE__) xfs_bmbt_trace_argbii(__FUNCTION__, c, b, i, j, __LINE__)
#define XFS_BMBT_TRACE_ARGFFFI(c,o,b,i,j) \ #define XFS_BMBT_TRACE_ARGFFFI(c,o,b,i,j) \
xfs_bmbt_trace_argfffi(fname, c, o, b, i, j, __LINE__) xfs_bmbt_trace_argfffi(__FUNCTION__, c, o, b, i, j, __LINE__)
#define XFS_BMBT_TRACE_ARGI(c,i) \ #define XFS_BMBT_TRACE_ARGI(c,i) \
xfs_bmbt_trace_argi(fname, c, i, __LINE__) xfs_bmbt_trace_argi(__FUNCTION__, c, i, __LINE__)
#define XFS_BMBT_TRACE_ARGIFK(c,i,f,s) \ #define XFS_BMBT_TRACE_ARGIFK(c,i,f,s) \
xfs_bmbt_trace_argifk(fname, c, i, f, s, __LINE__) xfs_bmbt_trace_argifk(__FUNCTION__, c, i, f, s, __LINE__)
#define XFS_BMBT_TRACE_ARGIFR(c,i,f,r) \ #define XFS_BMBT_TRACE_ARGIFR(c,i,f,r) \
xfs_bmbt_trace_argifr(fname, c, i, f, r, __LINE__) xfs_bmbt_trace_argifr(__FUNCTION__, c, i, f, r, __LINE__)
#define XFS_BMBT_TRACE_ARGIK(c,i,k) \ #define XFS_BMBT_TRACE_ARGIK(c,i,k) \
xfs_bmbt_trace_argik(fname, c, i, k, __LINE__) xfs_bmbt_trace_argik(__FUNCTION__, c, i, k, __LINE__)
#define XFS_BMBT_TRACE_CURSOR(c,s) \ #define XFS_BMBT_TRACE_CURSOR(c,s) \
xfs_bmbt_trace_cursor(fname, c, s, __LINE__) xfs_bmbt_trace_cursor(__FUNCTION__, c, s, __LINE__)
#else #else
#define XFS_BMBT_TRACE_ARGBI(c,b,i) #define XFS_BMBT_TRACE_ARGBI(c,b,i)
#define XFS_BMBT_TRACE_ARGBII(c,b,i,j) #define XFS_BMBT_TRACE_ARGBII(c,b,i,j)
...@@ -318,9 +318,6 @@ xfs_bmbt_delrec( ...@@ -318,9 +318,6 @@ xfs_bmbt_delrec(
xfs_fsblock_t bno; /* fs-relative block number */ xfs_fsblock_t bno; /* fs-relative block number */
xfs_buf_t *bp; /* buffer for block */ xfs_buf_t *bp; /* buffer for block */
int error; /* error return value */ int error; /* error return value */
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_delrec";
#endif
int i; /* loop counter */ int i; /* loop counter */
int j; /* temp state */ int j; /* temp state */
xfs_bmbt_key_t key; /* bmap btree key */ xfs_bmbt_key_t key; /* bmap btree key */
...@@ -694,9 +691,6 @@ xfs_bmbt_insrec( ...@@ -694,9 +691,6 @@ xfs_bmbt_insrec(
xfs_bmbt_block_t *block; /* bmap btree block */ xfs_bmbt_block_t *block; /* bmap btree block */
xfs_buf_t *bp; /* buffer for block */ xfs_buf_t *bp; /* buffer for block */
int error; /* error return value */ int error; /* error return value */
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_insrec";
#endif
int i; /* loop index */ int i; /* loop index */
xfs_bmbt_key_t key; /* bmap btree key */ xfs_bmbt_key_t key; /* bmap btree key */
xfs_bmbt_key_t *kp=NULL; /* pointer to bmap btree key */ xfs_bmbt_key_t *kp=NULL; /* pointer to bmap btree key */
...@@ -880,9 +874,6 @@ xfs_bmbt_killroot( ...@@ -880,9 +874,6 @@ xfs_bmbt_killroot(
xfs_bmbt_ptr_t *cpp; xfs_bmbt_ptr_t *cpp;
#ifdef DEBUG #ifdef DEBUG
int error; int error;
#endif
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_killroot";
#endif #endif
int i; int i;
xfs_bmbt_key_t *kp; xfs_bmbt_key_t *kp;
...@@ -973,9 +964,6 @@ xfs_bmbt_log_keys( ...@@ -973,9 +964,6 @@ xfs_bmbt_log_keys(
int kfirst, int kfirst,
int klast) int klast)
{ {
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_log_keys";
#endif
xfs_trans_t *tp; xfs_trans_t *tp;
XFS_BMBT_TRACE_CURSOR(cur, ENTRY); XFS_BMBT_TRACE_CURSOR(cur, ENTRY);
...@@ -1012,9 +1000,6 @@ xfs_bmbt_log_ptrs( ...@@ -1012,9 +1000,6 @@ xfs_bmbt_log_ptrs(
int pfirst, int pfirst,
int plast) int plast)
{ {
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_log_ptrs";
#endif
xfs_trans_t *tp; xfs_trans_t *tp;
XFS_BMBT_TRACE_CURSOR(cur, ENTRY); XFS_BMBT_TRACE_CURSOR(cur, ENTRY);
...@@ -1055,9 +1040,6 @@ xfs_bmbt_lookup( ...@@ -1055,9 +1040,6 @@ xfs_bmbt_lookup(
xfs_daddr_t d; xfs_daddr_t d;
xfs_sfiloff_t diff; xfs_sfiloff_t diff;
int error; /* error return value */ int error; /* error return value */
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_lookup";
#endif
xfs_fsblock_t fsbno=0; xfs_fsblock_t fsbno=0;
int high; int high;
int i; int i;
...@@ -1195,9 +1177,6 @@ xfs_bmbt_lshift( ...@@ -1195,9 +1177,6 @@ xfs_bmbt_lshift(
int *stat) /* success/failure */ int *stat) /* success/failure */
{ {
int error; /* error return value */ int error; /* error return value */
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_lshift";
#endif
#ifdef DEBUG #ifdef DEBUG
int i; /* loop counter */ int i; /* loop counter */
#endif #endif
...@@ -1331,9 +1310,6 @@ xfs_bmbt_rshift( ...@@ -1331,9 +1310,6 @@ xfs_bmbt_rshift(
int *stat) /* success/failure */ int *stat) /* success/failure */
{ {
int error; /* error return value */ int error; /* error return value */
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_rshift";
#endif
int i; /* loop counter */ int i; /* loop counter */
xfs_bmbt_key_t key; /* bmap btree key */ xfs_bmbt_key_t key; /* bmap btree key */
xfs_buf_t *lbp; /* left buffer pointer */ xfs_buf_t *lbp; /* left buffer pointer */
...@@ -1492,9 +1468,6 @@ xfs_bmbt_split( ...@@ -1492,9 +1468,6 @@ xfs_bmbt_split(
{ {
xfs_alloc_arg_t args; /* block allocation args */ xfs_alloc_arg_t args; /* block allocation args */
int error; /* error return value */ int error; /* error return value */
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_split";
#endif
int i; /* loop counter */ int i; /* loop counter */
xfs_fsblock_t lbno; /* left sibling block number */ xfs_fsblock_t lbno; /* left sibling block number */
xfs_buf_t *lbp; /* left buffer pointer */ xfs_buf_t *lbp; /* left buffer pointer */
...@@ -1640,9 +1613,6 @@ xfs_bmbt_updkey( ...@@ -1640,9 +1613,6 @@ xfs_bmbt_updkey(
xfs_buf_t *bp; xfs_buf_t *bp;
#ifdef DEBUG #ifdef DEBUG
int error; int error;
#endif
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_updkey";
#endif #endif
xfs_bmbt_key_t *kp; xfs_bmbt_key_t *kp;
int ptr; int ptr;
...@@ -1712,9 +1682,6 @@ xfs_bmbt_decrement( ...@@ -1712,9 +1682,6 @@ xfs_bmbt_decrement(
xfs_bmbt_block_t *block; xfs_bmbt_block_t *block;
xfs_buf_t *bp; xfs_buf_t *bp;
int error; /* error return value */ int error; /* error return value */
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_decrement";
#endif
xfs_fsblock_t fsbno; xfs_fsblock_t fsbno;
int lev; int lev;
xfs_mount_t *mp; xfs_mount_t *mp;
...@@ -1785,9 +1752,6 @@ xfs_bmbt_delete( ...@@ -1785,9 +1752,6 @@ xfs_bmbt_delete(
int *stat) /* success/failure */ int *stat) /* success/failure */
{ {
int error; /* error return value */ int error; /* error return value */
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_delete";
#endif
int i; int i;
int level; int level;
...@@ -2000,9 +1964,6 @@ xfs_bmbt_increment( ...@@ -2000,9 +1964,6 @@ xfs_bmbt_increment(
xfs_bmbt_block_t *block; xfs_bmbt_block_t *block;
xfs_buf_t *bp; xfs_buf_t *bp;
int error; /* error return value */ int error; /* error return value */
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_increment";
#endif
xfs_fsblock_t fsbno; xfs_fsblock_t fsbno;
int lev; int lev;
xfs_mount_t *mp; xfs_mount_t *mp;
...@@ -2080,9 +2041,6 @@ xfs_bmbt_insert( ...@@ -2080,9 +2041,6 @@ xfs_bmbt_insert(
int *stat) /* success/failure */ int *stat) /* success/failure */
{ {
int error; /* error return value */ int error; /* error return value */
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_insert";
#endif
int i; int i;
int level; int level;
xfs_fsblock_t nbno; xfs_fsblock_t nbno;
...@@ -2142,9 +2100,6 @@ xfs_bmbt_log_block( ...@@ -2142,9 +2100,6 @@ xfs_bmbt_log_block(
int fields) int fields)
{ {
int first; int first;
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_log_block";
#endif
int last; int last;
xfs_trans_t *tp; xfs_trans_t *tp;
static const short offsets[] = { static const short offsets[] = {
...@@ -2181,9 +2136,6 @@ xfs_bmbt_log_recs( ...@@ -2181,9 +2136,6 @@ xfs_bmbt_log_recs(
{ {
xfs_bmbt_block_t *block; xfs_bmbt_block_t *block;
int first; int first;
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_log_recs";
#endif
int last; int last;
xfs_bmbt_rec_t *rp; xfs_bmbt_rec_t *rp;
xfs_trans_t *tp; xfs_trans_t *tp;
...@@ -2245,9 +2197,6 @@ xfs_bmbt_newroot( ...@@ -2245,9 +2197,6 @@ xfs_bmbt_newroot(
xfs_bmbt_key_t *ckp; /* child key pointer */ xfs_bmbt_key_t *ckp; /* child key pointer */
xfs_bmbt_ptr_t *cpp; /* child ptr pointer */ xfs_bmbt_ptr_t *cpp; /* child ptr pointer */
int error; /* error return code */ int error; /* error return code */
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_newroot";
#endif
#ifdef DEBUG #ifdef DEBUG
int i; /* loop counter */ int i; /* loop counter */
#endif #endif
...@@ -2630,9 +2579,6 @@ xfs_bmbt_update( ...@@ -2630,9 +2579,6 @@ xfs_bmbt_update(
xfs_bmbt_block_t *block; xfs_bmbt_block_t *block;
xfs_buf_t *bp; xfs_buf_t *bp;
int error; int error;
#ifdef XFS_BMBT_TRACE
static char fname[] = "xfs_bmbt_update";
#endif
xfs_bmbt_key_t key; xfs_bmbt_key_t key;
int ptr; int ptr;
xfs_bmbt_rec_t *rp; xfs_bmbt_rec_t *rp;
......
fs/xfs/xfs_inode.c
View file @ 3a59c94c
...@@ -645,8 +645,7 @@ xfs_iformat_extents( ...@@ -645,8 +645,7 @@ xfs_iformat_extents(
ep->l1 = INT_GET(get_unaligned((__uint64_t*)&dp->l1), ep->l1 = INT_GET(get_unaligned((__uint64_t*)&dp->l1),
ARCH_CONVERT); ARCH_CONVERT);
} }
xfs_bmap_trace_exlist("xfs_iformat_extents", ip, nex, XFS_BMAP_TRACE_EXLIST(ip, nex, whichfork);
whichfork);
if (whichfork != XFS_DATA_FORK || if (whichfork != XFS_DATA_FORK ||
XFS_EXTFMT_INODE(ip) == XFS_EXTFMT_NOSTATE) XFS_EXTFMT_INODE(ip) == XFS_EXTFMT_NOSTATE)
if (unlikely(xfs_check_nostate_extents( if (unlikely(xfs_check_nostate_extents(
...@@ -2894,9 +2893,6 @@ xfs_iextents_copy( ...@@ -2894,9 +2893,6 @@ xfs_iextents_copy(
int copied; int copied;
xfs_bmbt_rec_t *dest_ep; xfs_bmbt_rec_t *dest_ep;
xfs_bmbt_rec_t *ep; xfs_bmbt_rec_t *ep;
#ifdef XFS_BMAP_TRACE
static char fname[] = "xfs_iextents_copy";
#endif
int i; int i;
xfs_ifork_t *ifp; xfs_ifork_t *ifp;
int nrecs; int nrecs;
...@@ -2907,7 +2903,7 @@ xfs_iextents_copy( ...@@ -2907,7 +2903,7 @@ xfs_iextents_copy(
ASSERT(ifp->if_bytes > 0); ASSERT(ifp->if_bytes > 0);
nrecs = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t); nrecs = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
xfs_bmap_trace_exlist(fname, ip, nrecs, whichfork); XFS_BMAP_TRACE_EXLIST(ip, nrecs, whichfork);
ASSERT(nrecs > 0); ASSERT(nrecs > 0);
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7