Commit 42bf9dba authored by Hou Tao's avatar Hou Tao Committed by Darrick J. Wong

xfs: remove the trailing newline used in the fmt parameter of TP_printk

The trailing newlines wil lead to extra newlines in the trace file
which looks like the following output, so remove them.
>kworker/4:1H-1508  [004] .... 47879.101608: xfs_discard_extent: dev 8:0
>
>kworker/u16:2-238  [004] .... 47879.101725: xfs_extent_busy_clear: dev 8:0
Signed-off-by: default avatarHou Tao <houtao1@huawei.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
[darrick: fix the getfsmap tracepoints too]
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent cb52ee33
...@@ -2192,7 +2192,7 @@ DECLARE_EVENT_CLASS(xfs_discard_class, ...@@ -2192,7 +2192,7 @@ DECLARE_EVENT_CLASS(xfs_discard_class,
__entry->agbno = agbno; __entry->agbno = agbno;
__entry->len = len; __entry->len = len;
), ),
TP_printk("dev %d:%d agno %u agbno %u len %u\n", TP_printk("dev %d:%d agno %u agbno %u len %u",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->agbno, __entry->agbno,
...@@ -2264,7 +2264,7 @@ DECLARE_EVENT_CLASS(xfs_defer_class, ...@@ -2264,7 +2264,7 @@ DECLARE_EVENT_CLASS(xfs_defer_class,
__entry->committed = dop->dop_committed; __entry->committed = dop->dop_committed;
__entry->low = dop->dop_low; __entry->low = dop->dop_low;
), ),
TP_printk("dev %d:%d ops %p committed %d low %d\n", TP_printk("dev %d:%d ops %p committed %d low %d",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->dop, __entry->dop,
__entry->committed, __entry->committed,
...@@ -2292,7 +2292,7 @@ DECLARE_EVENT_CLASS(xfs_defer_error_class, ...@@ -2292,7 +2292,7 @@ DECLARE_EVENT_CLASS(xfs_defer_error_class,
__entry->low = dop->dop_low; __entry->low = dop->dop_low;
__entry->error = error; __entry->error = error;
), ),
TP_printk("dev %d:%d ops %p committed %d low %d err %d\n", TP_printk("dev %d:%d ops %p committed %d low %d err %d",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->dop, __entry->dop,
__entry->committed, __entry->committed,
...@@ -2321,7 +2321,7 @@ DECLARE_EVENT_CLASS(xfs_defer_pending_class, ...@@ -2321,7 +2321,7 @@ DECLARE_EVENT_CLASS(xfs_defer_pending_class,
__entry->committed = dfp->dfp_done != NULL; __entry->committed = dfp->dfp_done != NULL;
__entry->nr = dfp->dfp_count; __entry->nr = dfp->dfp_count;
), ),
TP_printk("dev %d:%d optype %d intent %p committed %d nr %d\n", TP_printk("dev %d:%d optype %d intent %p committed %d nr %d",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->type, __entry->type,
__entry->intent, __entry->intent,
...@@ -2616,7 +2616,8 @@ DECLARE_EVENT_CLASS(xfs_ag_resv_class, ...@@ -2616,7 +2616,8 @@ DECLARE_EVENT_CLASS(xfs_ag_resv_class,
__entry->asked = r ? r->ar_asked : 0; __entry->asked = r ? r->ar_asked : 0;
__entry->len = len; __entry->len = len;
), ),
TP_printk("dev %d:%d agno %u resv %d freeblks %u flcount %u resv %u ask %u len %u\n", TP_printk("dev %d:%d agno %u resv %d freeblks %u flcount %u "
"resv %u ask %u len %u",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->resv, __entry->resv,
...@@ -2669,7 +2670,7 @@ DECLARE_EVENT_CLASS(xfs_ag_btree_lookup_class, ...@@ -2669,7 +2670,7 @@ DECLARE_EVENT_CLASS(xfs_ag_btree_lookup_class,
__entry->agbno = agbno; __entry->agbno = agbno;
__entry->dir = dir; __entry->dir = dir;
), ),
TP_printk("dev %d:%d agno %u agbno %u cmp %s(%d)\n", TP_printk("dev %d:%d agno %u agbno %u cmp %s(%d)",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->agbno, __entry->agbno,
...@@ -2702,7 +2703,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_extent_class, ...@@ -2702,7 +2703,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_extent_class,
__entry->blockcount = irec->rc_blockcount; __entry->blockcount = irec->rc_blockcount;
__entry->refcount = irec->rc_refcount; __entry->refcount = irec->rc_refcount;
), ),
TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u\n", TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->startblock, __entry->startblock,
...@@ -2737,7 +2738,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_extent_at_class, ...@@ -2737,7 +2738,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_extent_at_class,
__entry->refcount = irec->rc_refcount; __entry->refcount = irec->rc_refcount;
__entry->agbno = agbno; __entry->agbno = agbno;
), ),
TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u @ agbno %u\n", TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u @ agbno %u",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->startblock, __entry->startblock,
...@@ -2778,7 +2779,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_double_extent_class, ...@@ -2778,7 +2779,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_double_extent_class,
__entry->i2_refcount = i2->rc_refcount; __entry->i2_refcount = i2->rc_refcount;
), ),
TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u -- " TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u -- "
"agbno %u len %u refcount %u\n", "agbno %u len %u refcount %u",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->i1_startblock, __entry->i1_startblock,
...@@ -2824,7 +2825,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_double_extent_at_class, ...@@ -2824,7 +2825,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_double_extent_at_class,
__entry->agbno = agbno; __entry->agbno = agbno;
), ),
TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u -- " TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u -- "
"agbno %u len %u refcount %u @ agbno %u\n", "agbno %u len %u refcount %u @ agbno %u",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->i1_startblock, __entry->i1_startblock,
...@@ -2877,7 +2878,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_triple_extent_class, ...@@ -2877,7 +2878,7 @@ DECLARE_EVENT_CLASS(xfs_refcount_triple_extent_class,
), ),
TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u -- " TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u -- "
"agbno %u len %u refcount %u -- " "agbno %u len %u refcount %u -- "
"agbno %u len %u refcount %u\n", "agbno %u len %u refcount %u",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->i1_startblock, __entry->i1_startblock,
...@@ -3204,7 +3205,7 @@ TRACE_EVENT(xfs_ioctl_clone, ...@@ -3204,7 +3205,7 @@ TRACE_EVENT(xfs_ioctl_clone,
), ),
TP_printk("dev %d:%d " TP_printk("dev %d:%d "
"ino 0x%lx isize 0x%llx -> " "ino 0x%lx isize 0x%llx -> "
"ino 0x%lx isize 0x%llx\n", "ino 0x%lx isize 0x%llx",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->src_ino, __entry->src_ino,
__entry->src_isize, __entry->src_isize,
...@@ -3269,7 +3270,7 @@ DECLARE_EVENT_CLASS(xfs_fsmap_class, ...@@ -3269,7 +3270,7 @@ DECLARE_EVENT_CLASS(xfs_fsmap_class,
__entry->offset = rmap->rm_offset; __entry->offset = rmap->rm_offset;
__entry->flags = rmap->rm_flags; __entry->flags = rmap->rm_flags;
), ),
TP_printk("dev %d:%d keydev %d:%d agno %u bno %llu len %llu owner %lld offset %llu flags 0x%x\n", TP_printk("dev %d:%d keydev %d:%d agno %u bno %llu len %llu owner %lld offset %llu flags 0x%x",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
MAJOR(__entry->keydev), MINOR(__entry->keydev), MAJOR(__entry->keydev), MINOR(__entry->keydev),
__entry->agno, __entry->agno,
...@@ -3309,7 +3310,7 @@ DECLARE_EVENT_CLASS(xfs_getfsmap_class, ...@@ -3309,7 +3310,7 @@ DECLARE_EVENT_CLASS(xfs_getfsmap_class,
__entry->offset = fsmap->fmr_offset; __entry->offset = fsmap->fmr_offset;
__entry->flags = fsmap->fmr_flags; __entry->flags = fsmap->fmr_flags;
), ),
TP_printk("dev %d:%d keydev %d:%d block %llu len %llu owner %lld offset %llu flags 0x%llx\n", TP_printk("dev %d:%d keydev %d:%d block %llu len %llu owner %lld offset %llu flags 0x%llx",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
MAJOR(__entry->keydev), MINOR(__entry->keydev), MAJOR(__entry->keydev), MINOR(__entry->keydev),
__entry->block, __entry->block,
......
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