tracing: Use __get_str() when manipulating strings

Use __get_str(str) rather than __get_dynamic_array(str) when
deadling with strings.

It is just a code cleanup, no changes on tracepoint ABI.

Link: http://lkml.kernel.org/r/ea260df91817411cca2a1f3db2abd88860094788.1467407618.git.bristot@redhat.com
Cc: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: Anna Schumaker <anna.schumaker@netapp.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: linux-nfs@vger.kernel.org
Suggested-by: Steven Rostedt <rostedt@goodmis.org>
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Daniel Bristot de Oliveira <bristot@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index 9c150b15378223697b8b088dd58e9e7a7ae53562..cfb8f7ce5cf6dbda09066ebc1cd21b0f6ee5757d 100644 (file)
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -1235,8 +1235,8 @@ DECLARE_EVENT_CLASS(nfs4_idmap_event,
                                len = 0;
                        __entry->error = error < 0 ? error : 0;
                        __entry->id = id;
-                       memcpy(__get_dynamic_array(name), name, len);
-                       ((char *)__get_dynamic_array(name))[len] = 0;
+                       memcpy(__get_str(name), name, len);
+                       __get_str(name)[len] = 0;
                ),
 
                TP_printk(

diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
index 0b9e5cc9a74705f3cade3c431b479eaa6e01e08c..31c7763b94d58803c832e08f2d046f27de7c9c2f 100644 (file)
--- a/fs/nfs/nfstrace.h
+++ b/fs/nfs/nfstrace.h
@@ -707,9 +707,9 @@ TRACE_EVENT(nfs_sillyrename_unlink,
                        __entry->dev = dir->i_sb->s_dev;
                        __entry->dir = NFS_FILEID(dir);
                        __entry->error = error;
-                       memcpy(__get_dynamic_array(name),
+                       memcpy(__get_str(name),
                                data->args.name.name, len);
-                       ((char *)__get_dynamic_array(name))[len] = 0;
+                       __get_str(name)[len] = 0;
                ),
 
                TP_printk(

diff --git a/include/trace/events/printk.h b/include/trace/events/printk.h
index c008bc99f9fa9093beb2668f2ebb33a72b825715..542a7558154ae8acbb14c603e9f65152b31d9c99 100644 (file)
--- a/include/trace/events/printk.h
+++ b/include/trace/events/printk.h
@@ -16,8 +16,8 @@ TRACE_EVENT(console,
        ),
 
        TP_fast_assign(
-               memcpy(__get_dynamic_array(msg), text, len);
-               ((char *)__get_dynamic_array(msg))[len] = 0;
+               memcpy(__get_str(msg), text, len);
+               __get_str(msg)[len] = 0;
        ),
 
        TP_printk("%s", __get_str(msg))