diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-21 15:44:34 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-21 15:44:34 +0900 |
| commit | 4b4f887fb2780e39383c1f202b72f5a2780b2d4c (patch) | |
| tree | e790d89c2612d2464ac00063dac677653f4ac9cb /fs/xfs/xfs_bmap_btree.c | |
| parent | 6424db52e24e8cdf89917fa3c10395116440160e (diff) | |
| parent | 76e7461a21dfe13565b2a323b53c8cc963541126 (diff) | |
| download | lwn-4b4f887fb2780e39383c1f202b72f5a2780b2d4c.tar.gz lwn-4b4f887fb2780e39383c1f202b72f5a2780b2d4c.zip | |
Merge branch 'master' into sh/hw-breakpoints
Diffstat (limited to 'fs/xfs/xfs_bmap_btree.c')
| -rw-r--r-- | fs/xfs/xfs_bmap_btree.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/xfs/xfs_bmap_btree.c b/fs/xfs/xfs_bmap_btree.c index eb7b702d0690..38751d5fac6f 100644 --- a/fs/xfs/xfs_bmap_btree.c +++ b/fs/xfs/xfs_bmap_btree.c @@ -98,8 +98,7 @@ xfs_bmdr_to_bmbt( * This code must be in sync with the routines xfs_bmbt_get_startoff, * xfs_bmbt_get_startblock, xfs_bmbt_get_blockcount and xfs_bmbt_get_state. */ - -STATIC_INLINE void +STATIC void __xfs_bmbt_get_all( __uint64_t l0, __uint64_t l1, @@ -769,12 +768,6 @@ xfs_bmbt_trace_enter( (void *)a0, (void *)a1, (void *)a2, (void *)a3, (void *)a4, (void *)a5, (void *)a6, (void *)a7, (void *)a8, (void *)a9, (void *)a10); - ktrace_enter(ip->i_btrace, - (void *)((__psint_t)type | (whichfork << 8) | (line << 16)), - (void *)func, (void *)s, (void *)ip, (void *)cur, - (void *)a0, (void *)a1, (void *)a2, (void *)a3, - (void *)a4, (void *)a5, (void *)a6, (void *)a7, - (void *)a8, (void *)a9, (void *)a10); } STATIC void |