Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Daniel Bristot de Oliveira and committed by
Steven Rostedt
752d596b a17167ce

+6 -6
+2 -2
fs/nfs/nfs4trace.h
··· 1235 1235 len = 0; 1236 1236 __entry->error = error < 0 ? error : 0; 1237 1237 __entry->id = id; 1238 - memcpy(__get_dynamic_array(name), name, len); 1239 - ((char *)__get_dynamic_array(name))[len] = 0; 1238 + memcpy(__get_str(name), name, len); 1239 + __get_str(name)[len] = 0; 1240 1240 ), 1241 1241 1242 1242 TP_printk(
+2 -2
fs/nfs/nfstrace.h
··· 707 707 __entry->dev = dir->i_sb->s_dev; 708 708 __entry->dir = NFS_FILEID(dir); 709 709 __entry->error = error; 710 - memcpy(__get_dynamic_array(name), 710 + memcpy(__get_str(name), 711 711 data->args.name.name, len); 712 - ((char *)__get_dynamic_array(name))[len] = 0; 712 + __get_str(name)[len] = 0; 713 713 ), 714 714 715 715 TP_printk(
+2 -2
include/trace/events/printk.h
··· 16 16 ), 17 17 18 18 TP_fast_assign( 19 - memcpy(__get_dynamic_array(msg), text, len); 20 - ((char *)__get_dynamic_array(msg))[len] = 0; 19 + memcpy(__get_str(msg), text, len); 20 + __get_str(msg)[len] = 0; 21 21 ), 22 22 23 23 TP_printk("%s", __get_str(msg))