Update cachefiles trace event definitions to use u64 instead of
ino_t/unsigned long for inode number fields.

Signed-off-by: Jeff Layton <[email protected]>
---
 include/trace/events/cachefiles.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/trace/events/cachefiles.h 
b/include/trace/events/cachefiles.h
index 
a743b2a35ea7001447b3e05d41539cb88013bc7f..6e3b1424eea4dc9e414dd9d1439339132d516339
 100644
--- a/include/trace/events/cachefiles.h
+++ b/include/trace/events/cachefiles.h
@@ -249,10 +249,10 @@ TRACE_EVENT(cachefiles_lookup,
            TP_ARGS(obj, dir, de),
 
            TP_STRUCT__entry(
+                   __field(u64,                        dino)
+                   __field(u64,                        ino)
                    __field(unsigned int,               obj)
                    __field(short,                      error)
-                   __field(unsigned long,              dino)
-                   __field(unsigned long,              ino)
                             ),
 
            TP_fast_assign(
@@ -263,7 +263,7 @@ TRACE_EVENT(cachefiles_lookup,
                    __entry->error      = IS_ERR(de) ? PTR_ERR(de) : 0;
                           ),
 
-           TP_printk("o=%08x dB=%lx B=%lx e=%d",
+           TP_printk("o=%08x dB=%llx B=%llx e=%d",
                      __entry->obj, __entry->dino, __entry->ino, __entry->error)
            );
 
@@ -578,8 +578,8 @@ TRACE_EVENT(cachefiles_mark_active,
 
            /* Note that obj may be NULL */
            TP_STRUCT__entry(
+                   __field(u64,                        inode)
                    __field(unsigned int,               obj)
-                   __field(ino_t,                      inode)
                             ),
 
            TP_fast_assign(
@@ -587,7 +587,7 @@ TRACE_EVENT(cachefiles_mark_active,
                    __entry->inode      = inode->i_ino;
                           ),
 
-           TP_printk("o=%08x B=%lx",
+           TP_printk("o=%08x B=%llx",
                      __entry->obj, __entry->inode)
            );
 
@@ -599,8 +599,8 @@ TRACE_EVENT(cachefiles_mark_failed,
 
            /* Note that obj may be NULL */
            TP_STRUCT__entry(
+                   __field(u64,                        inode)
                    __field(unsigned int,               obj)
-                   __field(ino_t,                      inode)
                             ),
 
            TP_fast_assign(
@@ -608,7 +608,7 @@ TRACE_EVENT(cachefiles_mark_failed,
                    __entry->inode      = inode->i_ino;
                           ),
 
-           TP_printk("o=%08x B=%lx",
+           TP_printk("o=%08x B=%llx",
                      __entry->obj, __entry->inode)
            );
 
@@ -620,8 +620,8 @@ TRACE_EVENT(cachefiles_mark_inactive,
 
            /* Note that obj may be NULL */
            TP_STRUCT__entry(
+                   __field(u64,                        inode)
                    __field(unsigned int,               obj)
-                   __field(ino_t,                      inode)
                             ),
 
            TP_fast_assign(
@@ -629,7 +629,7 @@ TRACE_EVENT(cachefiles_mark_inactive,
                    __entry->inode      = inode->i_ino;
                           ),
 
-           TP_printk("o=%08x B=%lx",
+           TP_printk("o=%08x B=%llx",
                      __entry->obj, __entry->inode)
            );
 

-- 
2.53.0


Reply via email to