f2fs: widen trace event i_ino fields to u64

In trace events, change __field(ino_t, ...) to __field(u64, ...)
and update TP_printk format strings to %llu/%llx to match the
widened field type.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://patch.msgid.link/20260304-iino-u64-v3-10-2257ad83d372@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index 9364e677556207ac041353a9eb2d5c2ee49b9dff..05a46908acd946cf7c016d99923403c04448c697 100644 (file)
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -9,7 +9,7 @@
 #include <uapi/linux/f2fs.h>
 
 #define show_dev(dev)          MAJOR(dev), MINOR(dev)
-#define show_dev_ino(entry)    show_dev(entry->dev), (unsigned long)entry->ino
+#define show_dev_ino(entry)    show_dev(entry->dev), (unsigned long long)entry->ino
 
 TRACE_DEFINE_ENUM(NODE);
 TRACE_DEFINE_ENUM(DATA);
@@ -206,13 +206,13 @@ DECLARE_EVENT_CLASS(f2fs__inode,
        TP_ARGS(inode),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
+               __field(u64,    pino)
+               __field(loff_t, size)
+               __field(blkcnt_t, blocks)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
-               __field(ino_t,  pino)
                __field(umode_t, mode)
-               __field(loff_t, size)
                __field(unsigned int, nlink)
-               __field(blkcnt_t, blocks)
                __field(__u8,   advise)
        ),
 
@@ -227,10 +227,10 @@ DECLARE_EVENT_CLASS(f2fs__inode,
                __entry->advise = F2FS_I(inode)->i_advise;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, pino = %lu, i_mode = 0x%hx, "
+       TP_printk("dev = (%d,%d), ino = %llu, pino = %llu, i_mode = 0x%hx, "
                "i_size = %lld, i_nlink = %u, i_blocks = %llu, i_advise = 0x%x",
                show_dev_ino(__entry),
-               (unsigned long)__entry->pino,
+               __entry->pino,
                __entry->mode,
                __entry->size,
                (unsigned int)__entry->nlink,
@@ -245,8 +245,8 @@ DECLARE_EVENT_CLASS(f2fs__inode_exit,
        TP_ARGS(inode, ret),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __field(umode_t, mode)
                __field(int,    ret)
        ),
@@ -258,7 +258,7 @@ DECLARE_EVENT_CLASS(f2fs__inode_exit,
                __entry->ret    = ret;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, type: %s, mode = 0%o, ret = %d",
+       TP_printk("dev = (%d,%d), ino = %llu, type: %s, mode = 0%o, ret = %d",
                show_dev_ino(__entry),
                show_inode_type(__entry->mode & S_IFMT),
                __entry->mode & S_ALL_PERM,
@@ -279,8 +279,8 @@ TRACE_EVENT(f2fs_sync_file_exit,
        TP_ARGS(inode, cp_reason, datasync, ret),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __field(int,    cp_reason)
                __field(int,    datasync)
                __field(int,    ret)
@@ -294,7 +294,7 @@ TRACE_EVENT(f2fs_sync_file_exit,
                __entry->ret            = ret;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, cp_reason: %s, "
+       TP_printk("dev = (%d,%d), ino = %llu, cp_reason: %s, "
                "datasync = %d, ret = %d",
                show_dev_ino(__entry),
                show_fsync_cpreason(__entry->cp_reason),
@@ -361,10 +361,10 @@ TRACE_EVENT(f2fs_unlink_enter,
        TP_ARGS(dir, dentry),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
+               __field(u64,    ino)
                __field(loff_t, size)
                __field(blkcnt_t, blocks)
+               __field(dev_t,  dev)
                __string(name,  dentry->d_name.name)
        ),
 
@@ -376,7 +376,7 @@ TRACE_EVENT(f2fs_unlink_enter,
                __assign_str(name);
        ),
 
-       TP_printk("dev = (%d,%d), dir ino = %lu, i_size = %lld, "
+       TP_printk("dev = (%d,%d), dir ino = %llu, i_size = %lld, "
                "i_blocks = %llu, name = %s",
                show_dev_ino(__entry),
                __entry->size,
@@ -412,8 +412,8 @@ TRACE_EVENT(f2fs_truncate_data_blocks_range,
        TP_ARGS(inode, nid,  ofs, free),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __field(nid_t,  nid)
                __field(unsigned int,   ofs)
                __field(int,    free)
@@ -427,7 +427,7 @@ TRACE_EVENT(f2fs_truncate_data_blocks_range,
                __entry->free   = free;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, nid = %u, offset = %u, freed = %d",
+       TP_printk("dev = (%d,%d), ino = %llu, nid = %u, offset = %u, freed = %d",
                show_dev_ino(__entry),
                (unsigned int)__entry->nid,
                __entry->ofs,
@@ -441,11 +441,11 @@ DECLARE_EVENT_CLASS(f2fs__truncate_op,
        TP_ARGS(inode, from),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
+               __field(u64,    ino)
                __field(loff_t, size)
                __field(blkcnt_t, blocks)
                __field(u64,    from)
+               __field(dev_t,  dev)
        ),
 
        TP_fast_assign(
@@ -456,7 +456,7 @@ DECLARE_EVENT_CLASS(f2fs__truncate_op,
                __entry->from   = from;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, i_size = %lld, i_blocks = %llu, "
+       TP_printk("dev = (%d,%d), ino = %llu, i_size = %lld, i_blocks = %llu, "
                "start file offset = %llu",
                show_dev_ino(__entry),
                __entry->size,
@@ -499,8 +499,8 @@ DECLARE_EVENT_CLASS(f2fs__truncate_node,
        TP_ARGS(inode, nid, blk_addr),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __field(nid_t,  nid)
                __field(block_t,        blk_addr)
        ),
@@ -512,7 +512,7 @@ DECLARE_EVENT_CLASS(f2fs__truncate_node,
                __entry->blk_addr       = blk_addr;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, nid = %u, block_address = 0x%llx",
+       TP_printk("dev = (%d,%d), ino = %llu, nid = %u, block_address = 0x%llx",
                show_dev_ino(__entry),
                (unsigned int)__entry->nid,
                (unsigned long long)__entry->blk_addr)
@@ -546,8 +546,8 @@ TRACE_EVENT(f2fs_truncate_partial_nodes,
        TP_ARGS(inode, nid, depth, err),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __array(nid_t,  nid, 3)
                __field(int,    depth)
                __field(int,    err)
@@ -563,7 +563,7 @@ TRACE_EVENT(f2fs_truncate_partial_nodes,
                __entry->err    = err;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, "
+       TP_printk("dev = (%d,%d), ino = %llu, "
                "nid[0] = %u, nid[1] = %u, nid[2] = %u, depth = %d, err = %d",
                show_dev_ino(__entry),
                (unsigned int)__entry->nid[0],
@@ -581,11 +581,11 @@ TRACE_EVENT(f2fs_file_write_iter,
        TP_ARGS(inode, offset, length, ret),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
+               __field(u64,    ino)
                __field(loff_t, offset)
                __field(size_t, length)
                __field(ssize_t, ret)
+               __field(dev_t,  dev)
        ),
 
        TP_fast_assign(
@@ -596,7 +596,7 @@ TRACE_EVENT(f2fs_file_write_iter,
                __entry->ret    = ret;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, "
+       TP_printk("dev = (%d,%d), ino = %llu, "
                "offset = %lld, length = %zu, written(err) = %zd",
                show_dev_ino(__entry),
                __entry->offset,
@@ -611,11 +611,11 @@ TRACE_EVENT(f2fs_fadvise,
        TP_ARGS(inode, offset, len, advice),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
+               __field(u64,    ino)
                __field(loff_t, size)
                __field(loff_t, offset)
                __field(loff_t, len)
+               __field(dev_t,  dev)
                __field(int,    advice)
        ),
 
@@ -628,7 +628,7 @@ TRACE_EVENT(f2fs_fadvise,
                __entry->advice = advice;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, i_size = %lld offset:%llu, len:%llu, advise:%d",
+       TP_printk("dev = (%d,%d), ino = %llu, i_size = %lld offset:%llu, len:%llu, advise:%d",
                show_dev_ino(__entry),
                (unsigned long long)__entry->size,
                __entry->offset,
@@ -643,8 +643,8 @@ TRACE_EVENT(f2fs_map_blocks,
        TP_ARGS(inode, map, flag, ret),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __field(block_t,        m_lblk)
                __field(block_t,        m_pblk)
                __field(unsigned int,   m_len)
@@ -670,7 +670,7 @@ TRACE_EVENT(f2fs_map_blocks,
                __entry->ret            = ret;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, file offset = %llu, "
+       TP_printk("dev = (%d,%d), ino = %llu, file offset = %llu, "
                "start blkaddr = 0x%llx, len = 0x%llx, flags = %u, "
                "seg_type = %d, may_create = %d, multidevice = %d, "
                "flag = %d, err = %d",
@@ -885,8 +885,8 @@ TRACE_EVENT(f2fs_lookup_start,
        TP_ARGS(dir, dentry, flags),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __string(name,  dentry->d_name.name)
                __field(unsigned int, flags)
        ),
@@ -898,7 +898,7 @@ TRACE_EVENT(f2fs_lookup_start,
                __entry->flags  = flags;
        ),
 
-       TP_printk("dev = (%d,%d), pino = %lu, name:%s, flags:%u",
+       TP_printk("dev = (%d,%d), pino = %llu, name:%s, flags:%u",
                show_dev_ino(__entry),
                __get_str(name),
                __entry->flags)
@@ -912,8 +912,8 @@ TRACE_EVENT(f2fs_lookup_end,
        TP_ARGS(dir, dentry, ino, err),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __string(name,  dentry->d_name.name)
                __field(nid_t,  cino)
                __field(int,    err)
@@ -927,7 +927,7 @@ TRACE_EVENT(f2fs_lookup_end,
                __entry->err    = err;
        ),
 
-       TP_printk("dev = (%d,%d), pino = %lu, name:%s, ino:%u, err:%d",
+       TP_printk("dev = (%d,%d), pino = %llu, name:%s, ino:%u, err:%d",
                show_dev_ino(__entry),
                __get_str(name),
                __entry->cino,
@@ -943,10 +943,10 @@ TRACE_EVENT(f2fs_rename_start,
        TP_ARGS(old_dir, old_dentry, new_dir, new_dentry, flags),
 
        TP_STRUCT__entry(
+               __field(u64,            ino)
+               __field(u64,            new_pino)
                __field(dev_t,          dev)
-               __field(ino_t,          ino)
                __string(old_name,      old_dentry->d_name.name)
-               __field(ino_t,          new_pino)
                __string(new_name,      new_dentry->d_name.name)
                __field(unsigned int,   flags)
        ),
@@ -960,8 +960,8 @@ TRACE_EVENT(f2fs_rename_start,
                __entry->flags          = flags;
        ),
 
-       TP_printk("dev = (%d,%d), old_dir = %lu, old_name: %s, "
-               "new_dir = %lu, new_name: %s, flags = %u",
+       TP_printk("dev = (%d,%d), old_dir = %llu, old_name: %s, "
+               "new_dir = %llu, new_name: %s, flags = %u",
                show_dev_ino(__entry),
                __get_str(old_name),
                __entry->new_pino,
@@ -977,8 +977,8 @@ TRACE_EVENT(f2fs_rename_end,
        TP_ARGS(old_dentry, new_dentry, flags, ret),
 
        TP_STRUCT__entry(
+               __field(u64,            ino)
                __field(dev_t,          dev)
-               __field(ino_t,          ino)
                __string(old_name,      old_dentry->d_name.name)
                __string(new_name,      new_dentry->d_name.name)
                __field(unsigned int,   flags)
@@ -994,7 +994,7 @@ TRACE_EVENT(f2fs_rename_end,
                __entry->ret            = ret;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, old_name: %s, "
+       TP_printk("dev = (%d,%d), ino = %llu, old_name: %s, "
                "new_name: %s, flags = %u, ret = %d",
                show_dev_ino(__entry),
                __get_str(old_name),
@@ -1010,10 +1010,10 @@ TRACE_EVENT(f2fs_readdir,
        TP_ARGS(dir, start_pos, end_pos, err),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
+               __field(u64,    ino)
                __field(loff_t, start)
                __field(loff_t, end)
+               __field(dev_t,  dev)
                __field(int,    err)
        ),
 
@@ -1025,7 +1025,7 @@ TRACE_EVENT(f2fs_readdir,
                __entry->err    = err;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, start_pos:%llu, end_pos:%llu, err:%d",
+       TP_printk("dev = (%d,%d), ino = %llu, start_pos:%llu, end_pos:%llu, err:%d",
                show_dev_ino(__entry),
                __entry->start,
                __entry->end,
@@ -1040,13 +1040,13 @@ TRACE_EVENT(f2fs_fallocate,
        TP_ARGS(inode, mode, offset, len, ret),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
-               __field(int,    mode)
+               __field(u64,    ino)
                __field(loff_t, offset)
                __field(loff_t, len)
                __field(loff_t, size)
                __field(blkcnt_t, blocks)
+               __field(dev_t,  dev)
+               __field(int,    mode)
                __field(int,    ret)
        ),
 
@@ -1061,7 +1061,7 @@ TRACE_EVENT(f2fs_fallocate,
                __entry->ret    = ret;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, mode = %x, offset = %lld, "
+       TP_printk("dev = (%d,%d), ino = %llu, mode = %x, offset = %lld, "
                "len = %lld,  i_size = %lld, i_blocks = %llu, ret = %d",
                show_dev_ino(__entry),
                __entry->mode,
@@ -1079,12 +1079,12 @@ TRACE_EVENT(f2fs_direct_IO_enter,
        TP_ARGS(inode, iocb, len, rw),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
+               __field(u64,    ino)
                __field(loff_t, ki_pos)
+               __field(unsigned long,  len)
+               __field(dev_t,  dev)
                __field(int,    ki_flags)
                __field(u16,    ki_ioprio)
-               __field(unsigned long,  len)
                __field(int,    rw)
        ),
 
@@ -1098,7 +1098,7 @@ TRACE_EVENT(f2fs_direct_IO_enter,
                __entry->rw             = rw;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu pos = %lld len = %lu ki_flags = %x ki_ioprio = %x rw = %d",
+       TP_printk("dev = (%d,%d), ino = %llu pos = %lld len = %lu ki_flags = %x ki_ioprio = %x rw = %d",
                show_dev_ino(__entry),
                __entry->ki_pos,
                __entry->len,
@@ -1115,10 +1115,10 @@ TRACE_EVENT(f2fs_direct_IO_exit,
        TP_ARGS(inode, offset, len, rw, ret),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
+               __field(u64,    ino)
                __field(loff_t, pos)
                __field(unsigned long,  len)
+               __field(dev_t,  dev)
                __field(int,    rw)
                __field(int,    ret)
        ),
@@ -1132,7 +1132,7 @@ TRACE_EVENT(f2fs_direct_IO_exit,
                __entry->ret    = ret;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu pos = %lld len = %lu "
+       TP_printk("dev = (%d,%d), ino = %llu pos = %lld len = %lu "
                "rw = %d ret = %d",
                show_dev_ino(__entry),
                __entry->pos,
@@ -1176,9 +1176,9 @@ DECLARE_EVENT_CLASS(f2fs__submit_folio_bio,
        TP_ARGS(folio, fio),
 
        TP_STRUCT__entry(
-               __field(dev_t, dev)
-               __field(ino_t, ino)
+               __field(u64, ino)
                __field(pgoff_t, index)
+               __field(dev_t, dev)
                __field(block_t, old_blkaddr)
                __field(block_t, new_blkaddr)
                __field(enum req_op, op)
@@ -1199,7 +1199,7 @@ DECLARE_EVENT_CLASS(f2fs__submit_folio_bio,
                __entry->type           = fio->type;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, folio_index = 0x%lx, "
+       TP_printk("dev = (%d,%d), ino = %llu, folio_index = 0x%lx, "
                "oldaddr = 0x%llx, newaddr = 0x%llx, rw = %s(%s), type = %s_%s",
                show_dev_ino(__entry),
                (unsigned long)__entry->index,
@@ -1306,9 +1306,9 @@ TRACE_EVENT(f2fs_write_begin,
        TP_ARGS(inode, pos, len),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
+               __field(u64,    ino)
                __field(loff_t, pos)
+               __field(dev_t,  dev)
                __field(unsigned int, len)
        ),
 
@@ -1319,7 +1319,7 @@ TRACE_EVENT(f2fs_write_begin,
                __entry->len    = len;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, pos = %llu, len = %u",
+       TP_printk("dev = (%d,%d), ino = %llu, pos = %llu, len = %u",
                show_dev_ino(__entry),
                (unsigned long long)__entry->pos,
                __entry->len)
@@ -1333,9 +1333,9 @@ TRACE_EVENT(f2fs_write_end,
        TP_ARGS(inode, pos, len, copied),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
+               __field(u64,    ino)
                __field(loff_t, pos)
+               __field(dev_t,  dev)
                __field(unsigned int, len)
                __field(unsigned int, copied)
        ),
@@ -1348,7 +1348,7 @@ TRACE_EVENT(f2fs_write_end,
                __entry->copied = copied;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, pos = %llu, len = %u, copied = %u",
+       TP_printk("dev = (%d,%d), ino = %llu, pos = %llu, len = %u, copied = %u",
                show_dev_ino(__entry),
                (unsigned long long)__entry->pos,
                __entry->len,
@@ -1362,12 +1362,12 @@ DECLARE_EVENT_CLASS(f2fs__folio,
        TP_ARGS(folio, type),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
+               __field(pgoff_t, index)
+               __field(pgoff_t, nrpages)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __field(int, type)
                __field(int, dir)
-               __field(pgoff_t, index)
-               __field(pgoff_t, nrpages)
                __field(int, dirty)
                __field(int, uptodate)
        ),
@@ -1383,7 +1383,7 @@ DECLARE_EVENT_CLASS(f2fs__folio,
                __entry->uptodate = folio_test_uptodate(folio);
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, %s, %s, index = %lu, nr_pages = %lu, "
+       TP_printk("dev = (%d,%d), ino = %llu, %s, %s, index = %lu, nr_pages = %lu, "
                "dirty = %d, uptodate = %d",
                show_dev_ino(__entry),
                show_block_type(__entry->type),
@@ -1437,10 +1437,10 @@ TRACE_EVENT(f2fs_replace_atomic_write_block,
        TP_ARGS(inode, cow_inode, index, old_addr, new_addr, recovery),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
-               __field(ino_t,  cow_ino)
+               __field(u64,    ino)
+               __field(u64,    cow_ino)
                __field(pgoff_t, index)
+               __field(dev_t,  dev)
                __field(block_t, old_addr)
                __field(block_t, new_addr)
                __field(bool, recovery)
@@ -1456,7 +1456,7 @@ TRACE_EVENT(f2fs_replace_atomic_write_block,
                __entry->recovery       = recovery;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, cow_ino = %lu, index = %lu, "
+       TP_printk("dev = (%d,%d), ino = %llu, cow_ino = %llu, index = %lu, "
                        "old_addr = 0x%llx, new_addr = 0x%llx, recovery = %d",
                show_dev_ino(__entry),
                __entry->cow_ino,
@@ -1474,10 +1474,10 @@ DECLARE_EVENT_CLASS(f2fs_mmap,
        TP_ARGS(inode, index, flags, ret),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
+               __field(u64,    ino)
                __field(pgoff_t, index)
                __field(vm_flags_t, flags)
+               __field(dev_t,  dev)
                __field(vm_fault_t, ret)
        ),
 
@@ -1489,7 +1489,7 @@ DECLARE_EVENT_CLASS(f2fs_mmap,
                __entry->ret    = ret;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, index = %lu, flags: %s, ret: %s",
+       TP_printk("dev = (%d,%d), ino = %llu, index = %lu, flags: %s, ret: %s",
                show_dev_ino(__entry),
                (unsigned long)__entry->index,
                __print_flags(__entry->flags, "|", FAULT_FLAG_TRACE),
@@ -1519,15 +1519,15 @@ TRACE_EVENT(f2fs_writepages,
        TP_ARGS(inode, wbc, type),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
-               __field(int,    type)
-               __field(int,    dir)
-               __field(long,   nr_to_write)
-               __field(long,   pages_skipped)
+               __field(u64,    ino)
                __field(loff_t, range_start)
                __field(loff_t, range_end)
+               __field(long,   nr_to_write)
+               __field(long,   pages_skipped)
                __field(pgoff_t, writeback_index)
+               __field(dev_t,  dev)
+               __field(int,    type)
+               __field(int,    dir)
                __field(int,    sync_mode)
                __field(char,   for_kupdate)
                __field(char,   for_background)
@@ -1554,7 +1554,7 @@ TRACE_EVENT(f2fs_writepages,
                __entry->for_sync       = wbc->for_sync;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, %s, %s, nr_to_write %ld, "
+       TP_printk("dev = (%d,%d), ino = %llu, %s, %s, nr_to_write %ld, "
                "skipped %ld, start %lld, end %lld, wb_idx %lu, sync_mode %d, "
                "kupdate %u background %u tagged %u cyclic %u sync %u",
                show_dev_ino(__entry),
@@ -1580,9 +1580,9 @@ TRACE_EVENT(f2fs_readpages,
        TP_ARGS(inode, start, nrpage),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
+               __field(u64,    ino)
                __field(pgoff_t,        start)
+               __field(dev_t,  dev)
                __field(unsigned int,   nrpage)
        ),
 
@@ -1593,7 +1593,7 @@ TRACE_EVENT(f2fs_readpages,
                __entry->nrpage = nrpage;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, start = %lu nrpage = %u",
+       TP_printk("dev = (%d,%d), ino = %llu, start = %lu nrpage = %u",
                show_dev_ino(__entry),
                (unsigned long)__entry->start,
                __entry->nrpage)
@@ -1738,8 +1738,8 @@ TRACE_EVENT(f2fs_lookup_extent_tree_start,
        TP_ARGS(inode, pgofs, type),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __field(unsigned int, pgofs)
                __field(enum extent_type, type)
        ),
@@ -1751,7 +1751,7 @@ TRACE_EVENT(f2fs_lookup_extent_tree_start,
                __entry->type = type;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, type = %s",
+       TP_printk("dev = (%d,%d), ino = %llu, pgofs = %u, type = %s",
                show_dev_ino(__entry),
                __entry->pgofs,
                show_extent_type(__entry->type))
@@ -1767,8 +1767,8 @@ TRACE_EVENT_CONDITION(f2fs_lookup_read_extent_tree_end,
        TP_CONDITION(ei),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __field(unsigned int, pgofs)
                __field(unsigned int, fofs)
                __field(unsigned int, len)
@@ -1784,7 +1784,7 @@ TRACE_EVENT_CONDITION(f2fs_lookup_read_extent_tree_end,
                __entry->blk = ei->blk;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, "
+       TP_printk("dev = (%d,%d), ino = %llu, pgofs = %u, "
                "read_ext_info(fofs: %u, len: %u, blk: %u)",
                show_dev_ino(__entry),
                __entry->pgofs,
@@ -1803,13 +1803,13 @@ TRACE_EVENT_CONDITION(f2fs_lookup_age_extent_tree_end,
        TP_CONDITION(ei),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
+               __field(unsigned long long, age)
+               __field(unsigned long long, blocks)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __field(unsigned int, pgofs)
                __field(unsigned int, fofs)
                __field(unsigned int, len)
-               __field(unsigned long long, age)
-               __field(unsigned long long, blocks)
        ),
 
        TP_fast_assign(
@@ -1822,7 +1822,7 @@ TRACE_EVENT_CONDITION(f2fs_lookup_age_extent_tree_end,
                __entry->blocks = ei->last_blocks;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, "
+       TP_printk("dev = (%d,%d), ino = %llu, pgofs = %u, "
                "age_ext_info(fofs: %u, len: %u, age: %llu, blocks: %llu)",
                show_dev_ino(__entry),
                __entry->pgofs,
@@ -1841,8 +1841,8 @@ TRACE_EVENT(f2fs_update_read_extent_tree_range,
        TP_ARGS(inode, pgofs, len, blkaddr, c_len),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __field(unsigned int, pgofs)
                __field(u32, blk)
                __field(unsigned int, len)
@@ -1858,7 +1858,7 @@ TRACE_EVENT(f2fs_update_read_extent_tree_range,
                __entry->c_len = c_len;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, "
+       TP_printk("dev = (%d,%d), ino = %llu, pgofs = %u, "
                                "len = %u, blkaddr = %u, c_len = %u",
                show_dev_ino(__entry),
                __entry->pgofs,
@@ -1876,12 +1876,12 @@ TRACE_EVENT(f2fs_update_age_extent_tree_range,
        TP_ARGS(inode, pgofs, len, age, last_blks),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
+               __field(unsigned long long, age)
+               __field(unsigned long long, blocks)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __field(unsigned int, pgofs)
                __field(unsigned int, len)
-               __field(unsigned long long, age)
-               __field(unsigned long long, blocks)
        ),
 
        TP_fast_assign(
@@ -1893,7 +1893,7 @@ TRACE_EVENT(f2fs_update_age_extent_tree_range,
                __entry->blocks = last_blks;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, "
+       TP_printk("dev = (%d,%d), ino = %llu, pgofs = %u, "
                                "len = %u, age = %llu, blocks = %llu",
                show_dev_ino(__entry),
                __entry->pgofs,
@@ -1938,8 +1938,8 @@ TRACE_EVENT(f2fs_destroy_extent_tree,
        TP_ARGS(inode, node_cnt, type),
 
        TP_STRUCT__entry(
+               __field(u64,    ino)
                __field(dev_t,  dev)
-               __field(ino_t,  ino)
                __field(unsigned int, node_cnt)
                __field(enum extent_type, type)
        ),
@@ -1951,7 +1951,7 @@ TRACE_EVENT(f2fs_destroy_extent_tree,
                __entry->type = type;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, destroyed: node_cnt = %u, type = %s",
+       TP_printk("dev = (%d,%d), ino = %llu, destroyed: node_cnt = %u, type = %s",
                show_dev_ino(__entry),
                __entry->node_cnt,
                show_extent_type(__entry->type))
@@ -2027,9 +2027,9 @@ DECLARE_EVENT_CLASS(f2fs_zip_start,
        TP_ARGS(inode, cluster_idx, cluster_size, algtype),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
+               __field(u64,    ino)
                __field(pgoff_t, idx)
+               __field(dev_t,  dev)
                __field(unsigned int, size)
                __field(unsigned int, algtype)
        ),
@@ -2042,7 +2042,7 @@ DECLARE_EVENT_CLASS(f2fs_zip_start,
                __entry->algtype = algtype;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, cluster_idx:%lu, "
+       TP_printk("dev = (%d,%d), ino = %llu, cluster_idx:%lu, "
                "cluster_size = %u, algorithm = %s",
                show_dev_ino(__entry),
                __entry->idx,
@@ -2058,9 +2058,9 @@ DECLARE_EVENT_CLASS(f2fs_zip_end,
        TP_ARGS(inode, cluster_idx, compressed_size, ret),
 
        TP_STRUCT__entry(
-               __field(dev_t,  dev)
-               __field(ino_t,  ino)
+               __field(u64,    ino)
                __field(pgoff_t, idx)
+               __field(dev_t,  dev)
                __field(unsigned int, size)
                __field(unsigned int, ret)
        ),
@@ -2073,7 +2073,7 @@ DECLARE_EVENT_CLASS(f2fs_zip_end,
                __entry->ret = ret;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, cluster_idx:%lu, "
+       TP_printk("dev = (%d,%d), ino = %llu, cluster_idx:%lu, "
                "compressed_size = %u, ret = %d",
                show_dev_ino(__entry),
                __entry->idx,
@@ -2311,10 +2311,10 @@ TRACE_EVENT(f2fs_bmap,
        TP_ARGS(inode, lblock, pblock),
 
        TP_STRUCT__entry(
-               __field(dev_t, dev)
-               __field(ino_t, ino)
+               __field(u64, ino)
                __field(sector_t, lblock)
                __field(sector_t, pblock)
+               __field(dev_t, dev)
        ),
 
        TP_fast_assign(
@@ -2324,7 +2324,7 @@ TRACE_EVENT(f2fs_bmap,
                __entry->pblock         = pblock;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, lblock:%lld, pblock:%lld",
+       TP_printk("dev = (%d,%d), ino = %llu, lblock:%lld, pblock:%lld",
                show_dev_ino(__entry),
                (unsigned long long)__entry->lblock,
                (unsigned long long)__entry->pblock)
@@ -2338,11 +2338,11 @@ TRACE_EVENT(f2fs_fiemap,
        TP_ARGS(inode, lblock, pblock, len, flags, ret),
 
        TP_STRUCT__entry(
-               __field(dev_t, dev)
-               __field(ino_t, ino)
+               __field(u64, ino)
                __field(sector_t, lblock)
                __field(sector_t, pblock)
                __field(unsigned long long, len)
+               __field(dev_t, dev)
                __field(unsigned int, flags)
                __field(int, ret)
        ),
@@ -2357,7 +2357,7 @@ TRACE_EVENT(f2fs_fiemap,
                __entry->ret            = ret;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, lblock:%lld, pblock:%lld, "
+       TP_printk("dev = (%d,%d), ino = %llu, lblock:%lld, pblock:%lld, "
                "len:%llu, flags:%u, ret:%d",
                show_dev_ino(__entry),
                (unsigned long long)__entry->lblock,
@@ -2375,13 +2375,13 @@ DECLARE_EVENT_CLASS(f2fs__rw_start,
        TP_ARGS(inode, offset, bytes, pid, pathname, command),
 
        TP_STRUCT__entry(
-               __string(pathbuf, pathname)
+               __field(u64, ino)
                __field(loff_t, offset)
-               __field(int, bytes)
                __field(loff_t, i_size)
+               __string(pathbuf, pathname)
                __string(cmdline, command)
                __field(pid_t, pid)
-               __field(ino_t, ino)
+               __field(int, bytes)
        ),
 
        TP_fast_assign(
@@ -2402,10 +2402,10 @@ DECLARE_EVENT_CLASS(f2fs__rw_start,
        ),
 
        TP_printk("entry_name %s, offset %llu, bytes %d, cmdline %s,"
-               " pid %d, i_size %llu, ino %lu",
+               " pid %d, i_size %llu, ino %llu",
                __get_str(pathbuf), __entry->offset, __entry->bytes,
                __get_str(cmdline), __entry->pid, __entry->i_size,
-               (unsigned long) __entry->ino)
+               __entry->ino)
 );
 
 DECLARE_EVENT_CLASS(f2fs__rw_end,
@@ -2415,7 +2415,7 @@ DECLARE_EVENT_CLASS(f2fs__rw_end,
        TP_ARGS(inode, offset, bytes),
 
        TP_STRUCT__entry(
-               __field(ino_t,  ino)
+               __field(u64,    ino)
                __field(loff_t, offset)
                __field(int,    bytes)
        ),
@@ -2426,8 +2426,8 @@ DECLARE_EVENT_CLASS(f2fs__rw_end,
                __entry->bytes          = bytes;
        ),
 
-       TP_printk("ino %lu, offset %llu, bytes %d",
-               (unsigned long) __entry->ino,
+       TP_printk("ino %llu, offset %llu, bytes %d",
+               __entry->ino,
                __entry->offset, __entry->bytes)
 );