]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
smb: client: remove \t from TP_printk statements
authorStefan Metzmacher <metze@samba.org>
Wed, 25 Jun 2025 08:13:04 +0000 (10:13 +0200)
committerSteve French <stfrench@microsoft.com>
Wed, 25 Jun 2025 18:51:50 +0000 (13:51 -0500)
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: stable@vger.kernel.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/smb/client/trace.h

index 52bcb55d995276f84b9344d253f6a18560cb3df5..93e5b2bb9f28a23afa44f7f452e1a63a77ad1e12 100644 (file)
@@ -140,7 +140,7 @@ DECLARE_EVENT_CLASS(smb3_rw_err_class,
                __entry->len = len;
                __entry->rc = rc;
        ),
-       TP_printk("\tR=%08x[%x] xid=%u sid=0x%llx tid=0x%x fid=0x%llx offset=0x%llx len=0x%x rc=%d",
+       TP_printk("R=%08x[%x] xid=%u sid=0x%llx tid=0x%x fid=0x%llx offset=0x%llx len=0x%x rc=%d",
                  __entry->rreq_debug_id, __entry->rreq_debug_index,
                  __entry->xid, __entry->sesid, __entry->tid, __entry->fid,
                  __entry->offset, __entry->len, __entry->rc)
@@ -190,7 +190,7 @@ DECLARE_EVENT_CLASS(smb3_other_err_class,
                __entry->len = len;
                __entry->rc = rc;
        ),
-       TP_printk("\txid=%u sid=0x%llx tid=0x%x fid=0x%llx offset=0x%llx len=0x%x rc=%d",
+       TP_printk("xid=%u sid=0x%llx tid=0x%x fid=0x%llx offset=0x%llx len=0x%x rc=%d",
                __entry->xid, __entry->sesid, __entry->tid, __entry->fid,
                __entry->offset, __entry->len, __entry->rc)
 )
@@ -247,7 +247,7 @@ DECLARE_EVENT_CLASS(smb3_copy_range_err_class,
                __entry->len = len;
                __entry->rc = rc;
        ),
-       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",
+       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",
                __entry->xid, __entry->sesid, __entry->tid, __entry->target_fid,
                __entry->src_offset, __entry->target_fid, __entry->target_offset, __entry->len, __entry->rc)
 )
@@ -298,7 +298,7 @@ DECLARE_EVENT_CLASS(smb3_copy_range_done_class,
                __entry->target_offset = target_offset;
                __entry->len = len;
        ),
-       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",
+       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",
                __entry->xid, __entry->sesid, __entry->tid, __entry->target_fid,
                __entry->src_offset, __entry->target_fid, __entry->target_offset, __entry->len)
 )
@@ -482,7 +482,7 @@ DECLARE_EVENT_CLASS(smb3_fd_class,
                __entry->tid = tid;
                __entry->sesid = sesid;
        ),
-       TP_printk("\txid=%u sid=0x%llx tid=0x%x fid=0x%llx",
+       TP_printk("xid=%u sid=0x%llx tid=0x%x fid=0x%llx",
                __entry->xid, __entry->sesid, __entry->tid, __entry->fid)
 )
 
@@ -521,7 +521,7 @@ DECLARE_EVENT_CLASS(smb3_fd_err_class,
                __entry->sesid = sesid;
                __entry->rc = rc;
        ),
-       TP_printk("\txid=%u sid=0x%llx tid=0x%x fid=0x%llx rc=%d",
+       TP_printk("xid=%u sid=0x%llx tid=0x%x fid=0x%llx rc=%d",
                __entry->xid, __entry->sesid, __entry->tid, __entry->fid,
                __entry->rc)
 )
@@ -794,7 +794,7 @@ DECLARE_EVENT_CLASS(smb3_cmd_err_class,
                __entry->status = status;
                __entry->rc = rc;
        ),
-       TP_printk("\tsid=0x%llx tid=0x%x cmd=%u mid=%llu status=0x%x rc=%d",
+       TP_printk("sid=0x%llx tid=0x%x cmd=%u mid=%llu status=0x%x rc=%d",
                __entry->sesid, __entry->tid, __entry->cmd, __entry->mid,
                __entry->status, __entry->rc)
 )
@@ -829,7 +829,7 @@ DECLARE_EVENT_CLASS(smb3_cmd_done_class,
                __entry->cmd = cmd;
                __entry->mid = mid;
        ),
-       TP_printk("\tsid=0x%llx tid=0x%x cmd=%u mid=%llu",
+       TP_printk("sid=0x%llx tid=0x%x cmd=%u mid=%llu",
                __entry->sesid, __entry->tid,
                __entry->cmd, __entry->mid)
 )
@@ -867,7 +867,7 @@ DECLARE_EVENT_CLASS(smb3_mid_class,
                __entry->when_sent = when_sent;
                __entry->when_received = when_received;
        ),
-       TP_printk("\tcmd=%u mid=%llu pid=%u, when_sent=%lu when_rcv=%lu",
+       TP_printk("cmd=%u mid=%llu pid=%u, when_sent=%lu when_rcv=%lu",
                __entry->cmd, __entry->mid, __entry->pid, __entry->when_sent,
                __entry->when_received)
 )
@@ -898,7 +898,7 @@ DECLARE_EVENT_CLASS(smb3_exit_err_class,
                __assign_str(func_name);
                __entry->rc = rc;
        ),
-       TP_printk("\t%s: xid=%u rc=%d",
+       TP_printk("%s: xid=%u rc=%d",
                __get_str(func_name), __entry->xid, __entry->rc)
 )
 
@@ -924,7 +924,7 @@ DECLARE_EVENT_CLASS(smb3_sync_err_class,
                __entry->ino = ino;
                __entry->rc = rc;
        ),
-       TP_printk("\tino=%lu rc=%d",
+       TP_printk("ino=%lu rc=%d",
                __entry->ino, __entry->rc)
 )
 
@@ -950,7 +950,7 @@ DECLARE_EVENT_CLASS(smb3_enter_exit_class,
                __entry->xid = xid;
                __assign_str(func_name);
        ),
-       TP_printk("\t%s: xid=%u",
+       TP_printk("%s: xid=%u",
                __get_str(func_name), __entry->xid)
 )