Skip to content

Commit e97f954

Browse files
metze-sambaSteve French
authored andcommitted
smb: client: remove \t from TP_printk statements
The generate '[FAILED TO PARSE]' strings in trace-cmd report output like this: rm-5298 [001] 6084.533748493: smb3_exit_err: [FAILED TO PARSE] xid=972 func_name=cifs_rmdir rc=-39 rm-5298 [001] 6084.533959234: smb3_enter: [FAILED TO PARSE] xid=973 func_name=cifs_closedir rm-5298 [001] 6084.533967630: smb3_close_enter: [FAILED TO PARSE] xid=973 fid=94489281833 tid=1 sesid=96758029877361 rm-5298 [001] 6084.534004008: smb3_cmd_enter: [FAILED TO PARSE] tid=1 sesid=96758029877361 cmd=6 mid=566 rm-5298 [001] 6084.552248232: smb3_cmd_done: [FAILED TO PARSE] tid=1 sesid=96758029877361 cmd=6 mid=566 rm-5298 [001] 6084.552280542: smb3_close_done: [FAILED TO PARSE] xid=973 fid=94489281833 tid=1 sesid=96758029877361 rm-5298 [001] 6084.552316034: smb3_exit_done: [FAILED TO PARSE] xid=973 func_name=cifs_closedir Cc: [email protected] Signed-off-by: Stefan Metzmacher <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent 1944f6a commit e97f954

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

fs/smb/client/trace.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ DECLARE_EVENT_CLASS(smb3_rw_err_class,
140140
__entry->len = len;
141141
__entry->rc = rc;
142142
),
143-
TP_printk("\tR=%08x[%x] xid=%u sid=0x%llx tid=0x%x fid=0x%llx offset=0x%llx len=0x%x rc=%d",
143+
TP_printk("R=%08x[%x] xid=%u sid=0x%llx tid=0x%x fid=0x%llx offset=0x%llx len=0x%x rc=%d",
144144
__entry->rreq_debug_id, __entry->rreq_debug_index,
145145
__entry->xid, __entry->sesid, __entry->tid, __entry->fid,
146146
__entry->offset, __entry->len, __entry->rc)
@@ -190,7 +190,7 @@ DECLARE_EVENT_CLASS(smb3_other_err_class,
190190
__entry->len = len;
191191
__entry->rc = rc;
192192
),
193-
TP_printk("\txid=%u sid=0x%llx tid=0x%x fid=0x%llx offset=0x%llx len=0x%x rc=%d",
193+
TP_printk("xid=%u sid=0x%llx tid=0x%x fid=0x%llx offset=0x%llx len=0x%x rc=%d",
194194
__entry->xid, __entry->sesid, __entry->tid, __entry->fid,
195195
__entry->offset, __entry->len, __entry->rc)
196196
)
@@ -247,7 +247,7 @@ DECLARE_EVENT_CLASS(smb3_copy_range_err_class,
247247
__entry->len = len;
248248
__entry->rc = rc;
249249
),
250-
TP_printk("\txid=%u sid=0x%llx tid=0x%x source fid=0x%llx source offset=0x%llx target fid=0x%llx target offset=0x%llx len=0x%x rc=%d",
250+
TP_printk("xid=%u sid=0x%llx tid=0x%x source fid=0x%llx source offset=0x%llx target fid=0x%llx target offset=0x%llx len=0x%x rc=%d",
251251
__entry->xid, __entry->sesid, __entry->tid, __entry->target_fid,
252252
__entry->src_offset, __entry->target_fid, __entry->target_offset, __entry->len, __entry->rc)
253253
)
@@ -298,7 +298,7 @@ DECLARE_EVENT_CLASS(smb3_copy_range_done_class,
298298
__entry->target_offset = target_offset;
299299
__entry->len = len;
300300
),
301-
TP_printk("\txid=%u sid=0x%llx tid=0x%x source fid=0x%llx source offset=0x%llx target fid=0x%llx target offset=0x%llx len=0x%x",
301+
TP_printk("xid=%u sid=0x%llx tid=0x%x source fid=0x%llx source offset=0x%llx target fid=0x%llx target offset=0x%llx len=0x%x",
302302
__entry->xid, __entry->sesid, __entry->tid, __entry->target_fid,
303303
__entry->src_offset, __entry->target_fid, __entry->target_offset, __entry->len)
304304
)
@@ -482,7 +482,7 @@ DECLARE_EVENT_CLASS(smb3_fd_class,
482482
__entry->tid = tid;
483483
__entry->sesid = sesid;
484484
),
485-
TP_printk("\txid=%u sid=0x%llx tid=0x%x fid=0x%llx",
485+
TP_printk("xid=%u sid=0x%llx tid=0x%x fid=0x%llx",
486486
__entry->xid, __entry->sesid, __entry->tid, __entry->fid)
487487
)
488488

@@ -521,7 +521,7 @@ DECLARE_EVENT_CLASS(smb3_fd_err_class,
521521
__entry->sesid = sesid;
522522
__entry->rc = rc;
523523
),
524-
TP_printk("\txid=%u sid=0x%llx tid=0x%x fid=0x%llx rc=%d",
524+
TP_printk("xid=%u sid=0x%llx tid=0x%x fid=0x%llx rc=%d",
525525
__entry->xid, __entry->sesid, __entry->tid, __entry->fid,
526526
__entry->rc)
527527
)
@@ -794,7 +794,7 @@ DECLARE_EVENT_CLASS(smb3_cmd_err_class,
794794
__entry->status = status;
795795
__entry->rc = rc;
796796
),
797-
TP_printk("\tsid=0x%llx tid=0x%x cmd=%u mid=%llu status=0x%x rc=%d",
797+
TP_printk("sid=0x%llx tid=0x%x cmd=%u mid=%llu status=0x%x rc=%d",
798798
__entry->sesid, __entry->tid, __entry->cmd, __entry->mid,
799799
__entry->status, __entry->rc)
800800
)
@@ -829,7 +829,7 @@ DECLARE_EVENT_CLASS(smb3_cmd_done_class,
829829
__entry->cmd = cmd;
830830
__entry->mid = mid;
831831
),
832-
TP_printk("\tsid=0x%llx tid=0x%x cmd=%u mid=%llu",
832+
TP_printk("sid=0x%llx tid=0x%x cmd=%u mid=%llu",
833833
__entry->sesid, __entry->tid,
834834
__entry->cmd, __entry->mid)
835835
)
@@ -867,7 +867,7 @@ DECLARE_EVENT_CLASS(smb3_mid_class,
867867
__entry->when_sent = when_sent;
868868
__entry->when_received = when_received;
869869
),
870-
TP_printk("\tcmd=%u mid=%llu pid=%u, when_sent=%lu when_rcv=%lu",
870+
TP_printk("cmd=%u mid=%llu pid=%u, when_sent=%lu when_rcv=%lu",
871871
__entry->cmd, __entry->mid, __entry->pid, __entry->when_sent,
872872
__entry->when_received)
873873
)
@@ -898,7 +898,7 @@ DECLARE_EVENT_CLASS(smb3_exit_err_class,
898898
__assign_str(func_name);
899899
__entry->rc = rc;
900900
),
901-
TP_printk("\t%s: xid=%u rc=%d",
901+
TP_printk("%s: xid=%u rc=%d",
902902
__get_str(func_name), __entry->xid, __entry->rc)
903903
)
904904

@@ -924,7 +924,7 @@ DECLARE_EVENT_CLASS(smb3_sync_err_class,
924924
__entry->ino = ino;
925925
__entry->rc = rc;
926926
),
927-
TP_printk("\tino=%lu rc=%d",
927+
TP_printk("ino=%lu rc=%d",
928928
__entry->ino, __entry->rc)
929929
)
930930

@@ -950,7 +950,7 @@ DECLARE_EVENT_CLASS(smb3_enter_exit_class,
950950
__entry->xid = xid;
951951
__assign_str(func_name);
952952
),
953-
TP_printk("\t%s: xid=%u",
953+
TP_printk("%s: xid=%u",
954954
__get_str(func_name), __entry->xid)
955955
)
956956

0 commit comments

Comments
 (0)