From b46e23fb6edfec3de0e4bc1c8aaa835c7c80aad4 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 28 Feb 2012 11:01:40 +0000 Subject: [PATCH] --- yaml --- r: 297215 b: refs/heads/master c: f616137519feb17b849894fcbe634a021d3fa7db h: refs/heads/master i: 297213: 7db5ffd4750329c0d5c7c3bd1d01e29491f5562a 297211: b99e23b7c7f072d190cce222c6d93f1a2d7ecc19 297207: b88fbb3ff921cd0c54bfaa8f8b992215d3dfbb4a 297199: 3129e1783ff5f4d440db7852b7cda3819362e897 297183: 696e2567d86d1a2585a26ea91008c8f5e10ddef1 297151: 622af671894ac83cd50c5891e032835ab3d34493 297087: 5cf3a848a82306a4da37981f3bc5dfe5be85c242 296959: 615aba3617f3ca78937aac37009de45ee6319e42 v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_trace.h | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6dfaf38c9875..463d80a9c809 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c999a223c2f0d31c64ef7379814cea1378b2b800 +refs/heads/master: f616137519feb17b849894fcbe634a021d3fa7db diff --git a/trunk/fs/xfs/xfs_trace.h b/trunk/fs/xfs/xfs_trace.h index 75eb54af4d58..afb028213dbd 100644 --- a/trunk/fs/xfs/xfs_trace.h +++ b/trunk/fs/xfs/xfs_trace.h @@ -627,16 +627,19 @@ DECLARE_EVENT_CLASS(xfs_namespace_class, TP_STRUCT__entry( __field(dev_t, dev) __field(xfs_ino_t, dp_ino) + __field(int, namelen) __dynamic_array(char, name, name->len) ), TP_fast_assign( __entry->dev = VFS_I(dp)->i_sb->s_dev; __entry->dp_ino = dp->i_ino; + __entry->namelen = name->len; memcpy(__get_str(name), name->name, name->len); ), - TP_printk("dev %d:%d dp ino 0x%llx name %s", + TP_printk("dev %d:%d dp ino 0x%llx name %.*s", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->dp_ino, + __entry->namelen, __get_str(name)) ) @@ -658,6 +661,8 @@ TRACE_EVENT(xfs_rename, __field(dev_t, dev) __field(xfs_ino_t, src_dp_ino) __field(xfs_ino_t, target_dp_ino) + __field(int, src_namelen) + __field(int, target_namelen) __dynamic_array(char, src_name, src_name->len) __dynamic_array(char, target_name, target_name->len) ), @@ -665,15 +670,20 @@ TRACE_EVENT(xfs_rename, __entry->dev = VFS_I(src_dp)->i_sb->s_dev; __entry->src_dp_ino = src_dp->i_ino; __entry->target_dp_ino = target_dp->i_ino; + __entry->src_namelen = src_name->len; + __entry->target_namelen = target_name->len; memcpy(__get_str(src_name), src_name->name, src_name->len); - memcpy(__get_str(target_name), target_name->name, target_name->len); + memcpy(__get_str(target_name), target_name->name, + target_name->len); ), TP_printk("dev %d:%d src dp ino 0x%llx target dp ino 0x%llx" - " src name %s target name %s", + " src name %.*s target name %.*s", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->src_dp_ino, __entry->target_dp_ino, + __entry->src_namelen, __get_str(src_name), + __entry->target_namelen, __get_str(target_name)) )