On Wed 04-03-26 10:32:34, Jeff Layton wrote: > Update VFS-layer trace event definitions to use u64 instead of > ino_t/unsigned long for inode number fields. Update TP_printk format > strings to use %llu/%llx to match the widened field type. Remove > now-unnecessary (unsigned long) casts since __entry->ino is already > u64. > > Signed-off-by: Jeff Layton <[email protected]>
Looks good. Feel free to add: Reviewed-by: Jan Kara <[email protected]> Honza > --- > fs/iomap/trace.h | 8 +- > include/trace/events/filelock.h | 34 ++++---- > include/trace/events/filemap.h | 20 ++--- > include/trace/events/fs_dax.h | 20 ++--- > include/trace/events/fsverity.h | 30 ++++---- > include/trace/events/netfs.h | 8 +- > include/trace/events/readahead.h | 18 ++--- > include/trace/events/timestamp.h | 16 ++-- > include/trace/events/writeback.h | 162 > +++++++++++++++++++-------------------- > 9 files changed, 158 insertions(+), 158 deletions(-) > > diff --git a/fs/iomap/trace.h b/fs/iomap/trace.h > index > 532787277b168e881759d521cd3559ec65979152..097773c6db80e289bb488ef2af6e29f0d777b102 > 100644 > --- a/fs/iomap/trace.h > +++ b/fs/iomap/trace.h > @@ -257,7 +257,7 @@ TRACE_EVENT(iomap_dio_rw_begin, > TP_ARGS(iocb, iter, dio_flags, done_before), > TP_STRUCT__entry( > __field(dev_t, dev) > - __field(ino_t, ino) > + __field(u64, ino) > __field(loff_t, isize) > __field(loff_t, pos) > __field(size_t, count) > @@ -277,7 +277,7 @@ TRACE_EVENT(iomap_dio_rw_begin, > __entry->dio_flags = dio_flags; > __entry->aio = !is_sync_kiocb(iocb); > ), > - TP_printk("dev %d:%d ino 0x%lx size 0x%llx offset 0x%llx length 0x%zx > done_before 0x%zx flags %s dio_flags %s aio %d", > + TP_printk("dev %d:%d ino 0x%llx size 0x%llx offset 0x%llx length 0x%zx > done_before 0x%zx flags %s dio_flags %s aio %d", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->ino, > __entry->isize, > @@ -294,7 +294,7 @@ TRACE_EVENT(iomap_dio_complete, > TP_ARGS(iocb, error, ret), > TP_STRUCT__entry( > __field(dev_t, dev) > - __field(ino_t, ino) > + __field(u64, ino) > __field(loff_t, isize) > __field(loff_t, pos) > __field(int, ki_flags) > @@ -312,7 +312,7 @@ TRACE_EVENT(iomap_dio_complete, > __entry->error = error; > __entry->ret = ret; > ), > - TP_printk("dev %d:%d ino 0x%lx size 0x%llx offset 0x%llx flags %s aio > %d error %d ret %zd", > + TP_printk("dev %d:%d ino 0x%llx size 0x%llx offset 0x%llx flags %s aio > %d error %d ret %zd", > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->ino, > __entry->isize, > diff --git a/include/trace/events/filelock.h b/include/trace/events/filelock.h > index > 370016c38a5bbc07d5ba6c102030b49c9eb6424d..1167748862449ef6ff04c40b568ea8c3bbb08207 > 100644 > --- a/include/trace/events/filelock.h > +++ b/include/trace/events/filelock.h > @@ -42,10 +42,10 @@ TRACE_EVENT(locks_get_lock_context, > TP_ARGS(inode, type, ctx), > > TP_STRUCT__entry( > - __field(unsigned long, i_ino) > + __field(u64, i_ino) > + __field(struct file_lock_context *, ctx) > __field(dev_t, s_dev) > __field(unsigned char, type) > - __field(struct file_lock_context *, ctx) > ), > > TP_fast_assign( > @@ -55,7 +55,7 @@ TRACE_EVENT(locks_get_lock_context, > __entry->ctx = ctx; > ), > > - TP_printk("dev=0x%x:0x%x ino=0x%lx type=%s ctx=%p", > + TP_printk("dev=0x%x:0x%x ino=0x%llx type=%s ctx=%p", > MAJOR(__entry->s_dev), MINOR(__entry->s_dev), > __entry->i_ino, show_fl_type(__entry->type), __entry->ctx) > ); > @@ -66,16 +66,16 @@ DECLARE_EVENT_CLASS(filelock_lock, > TP_ARGS(inode, fl, ret), > > TP_STRUCT__entry( > + __field(u64, i_ino) > + __field(loff_t, fl_start) > + __field(loff_t, fl_end) > __field(struct file_lock *, fl) > - __field(unsigned long, i_ino) > - __field(dev_t, s_dev) > __field(struct file_lock_core *, blocker) > __field(fl_owner_t, owner) > + __field(dev_t, s_dev) > __field(unsigned int, pid) > __field(unsigned int, flags) > __field(unsigned char, type) > - __field(loff_t, fl_start) > - __field(loff_t, fl_end) > __field(int, ret) > ), > > @@ -93,7 +93,7 @@ DECLARE_EVENT_CLASS(filelock_lock, > __entry->ret = ret; > ), > > - TP_printk("fl=%p dev=0x%x:0x%x ino=0x%lx fl_blocker=%p fl_owner=%p > fl_pid=%u fl_flags=%s fl_type=%s fl_start=%lld fl_end=%lld ret=%d", > + TP_printk("fl=%p dev=0x%x:0x%x ino=0x%llx fl_blocker=%p fl_owner=%p > fl_pid=%u fl_flags=%s fl_type=%s fl_start=%lld fl_end=%lld ret=%d", > __entry->fl, MAJOR(__entry->s_dev), MINOR(__entry->s_dev), > __entry->i_ino, __entry->blocker, __entry->owner, > __entry->pid, show_fl_flags(__entry->flags), > @@ -123,15 +123,15 @@ DECLARE_EVENT_CLASS(filelock_lease, > TP_ARGS(inode, fl), > > TP_STRUCT__entry( > + __field(u64, i_ino) > __field(struct file_lease *, fl) > - __field(unsigned long, i_ino) > - __field(dev_t, s_dev) > __field(struct file_lock_core *, blocker) > __field(fl_owner_t, owner) > - __field(unsigned int, flags) > - __field(unsigned char, type) > __field(unsigned long, break_time) > __field(unsigned long, downgrade_time) > + __field(dev_t, s_dev) > + __field(unsigned int, flags) > + __field(unsigned char, type) > ), > > TP_fast_assign( > @@ -146,7 +146,7 @@ DECLARE_EVENT_CLASS(filelock_lease, > __entry->downgrade_time = fl ? fl->fl_downgrade_time : 0; > ), > > - TP_printk("fl=%p dev=0x%x:0x%x ino=0x%lx fl_blocker=%p fl_owner=%p > fl_flags=%s fl_type=%s fl_break_time=%lu fl_downgrade_time=%lu", > + TP_printk("fl=%p dev=0x%x:0x%x ino=0x%llx fl_blocker=%p fl_owner=%p > fl_flags=%s fl_type=%s fl_break_time=%lu fl_downgrade_time=%lu", > __entry->fl, MAJOR(__entry->s_dev), MINOR(__entry->s_dev), > __entry->i_ino, __entry->blocker, __entry->owner, > show_fl_flags(__entry->flags), > @@ -175,12 +175,12 @@ TRACE_EVENT(generic_add_lease, > TP_ARGS(inode, fl), > > TP_STRUCT__entry( > - __field(unsigned long, i_ino) > + __field(u64, i_ino) > + __field(fl_owner_t, owner) > + __field(dev_t, s_dev) > __field(int, wcount) > __field(int, rcount) > __field(int, icount) > - __field(dev_t, s_dev) > - __field(fl_owner_t, owner) > __field(unsigned int, flags) > __field(unsigned char, type) > ), > @@ -196,7 +196,7 @@ TRACE_EVENT(generic_add_lease, > __entry->type = fl->c.flc_type; > ), > > - TP_printk("dev=0x%x:0x%x ino=0x%lx wcount=%d rcount=%d icount=%d > fl_owner=%p fl_flags=%s fl_type=%s", > + TP_printk("dev=0x%x:0x%x ino=0x%llx wcount=%d rcount=%d icount=%d > fl_owner=%p fl_flags=%s fl_type=%s", > MAJOR(__entry->s_dev), MINOR(__entry->s_dev), > __entry->i_ino, __entry->wcount, __entry->rcount, > __entry->icount, __entry->owner, > diff --git a/include/trace/events/filemap.h b/include/trace/events/filemap.h > index > f48fe637bfd25885dc6daaf09336ab60626b4944..4dcf8e9e2e0d8bde7c9df9856c059d2cdebff59f > 100644 > --- a/include/trace/events/filemap.h > +++ b/include/trace/events/filemap.h > @@ -20,8 +20,8 @@ DECLARE_EVENT_CLASS(mm_filemap_op_page_cache, > TP_ARGS(folio), > > TP_STRUCT__entry( > + __field(u64, i_ino) > __field(unsigned long, pfn) > - __field(unsigned long, i_ino) > __field(unsigned long, index) > __field(dev_t, s_dev) > __field(unsigned char, order) > @@ -38,7 +38,7 @@ DECLARE_EVENT_CLASS(mm_filemap_op_page_cache, > __entry->order = folio_order(folio); > ), > > - TP_printk("dev %d:%d ino %lx pfn=0x%lx ofs=%lu order=%u", > + TP_printk("dev %d:%d ino %llx pfn=0x%lx ofs=%lu order=%u", > MAJOR(__entry->s_dev), MINOR(__entry->s_dev), > __entry->i_ino, > __entry->pfn, > @@ -67,7 +67,7 @@ DECLARE_EVENT_CLASS(mm_filemap_op_page_cache_range, > TP_ARGS(mapping, index, last_index), > > TP_STRUCT__entry( > - __field(unsigned long, i_ino) > + __field(u64, i_ino) > __field(dev_t, s_dev) > __field(unsigned long, index) > __field(unsigned long, last_index) > @@ -85,7 +85,7 @@ DECLARE_EVENT_CLASS(mm_filemap_op_page_cache_range, > ), > > TP_printk( > - "dev=%d:%d ino=%lx ofs=%lld-%lld", > + "dev=%d:%d ino=%llx ofs=%lld-%lld", > MAJOR(__entry->s_dev), > MINOR(__entry->s_dev), __entry->i_ino, > ((loff_t)__entry->index) << PAGE_SHIFT, > @@ -117,7 +117,7 @@ TRACE_EVENT(mm_filemap_fault, > TP_ARGS(mapping, index), > > TP_STRUCT__entry( > - __field(unsigned long, i_ino) > + __field(u64, i_ino) > __field(dev_t, s_dev) > __field(unsigned long, index) > ), > @@ -133,7 +133,7 @@ TRACE_EVENT(mm_filemap_fault, > ), > > TP_printk( > - "dev=%d:%d ino=%lx ofs=%lld", > + "dev=%d:%d ino=%llx ofs=%lld", > MAJOR(__entry->s_dev), > MINOR(__entry->s_dev), __entry->i_ino, > ((loff_t)__entry->index) << PAGE_SHIFT > @@ -146,7 +146,7 @@ TRACE_EVENT(filemap_set_wb_err, > TP_ARGS(mapping, eseq), > > TP_STRUCT__entry( > - __field(unsigned long, i_ino) > + __field(u64, i_ino) > __field(dev_t, s_dev) > __field(errseq_t, errseq) > ), > @@ -160,7 +160,7 @@ TRACE_EVENT(filemap_set_wb_err, > __entry->s_dev = mapping->host->i_rdev; > ), > > - TP_printk("dev=%d:%d ino=0x%lx errseq=0x%x", > + TP_printk("dev=%d:%d ino=0x%llx errseq=0x%x", > MAJOR(__entry->s_dev), MINOR(__entry->s_dev), > __entry->i_ino, __entry->errseq) > ); > @@ -171,8 +171,8 @@ TRACE_EVENT(file_check_and_advance_wb_err, > TP_ARGS(file, old), > > TP_STRUCT__entry( > + __field(u64, i_ino) > __field(struct file *, file) > - __field(unsigned long, i_ino) > __field(dev_t, s_dev) > __field(errseq_t, old) > __field(errseq_t, new) > @@ -191,7 +191,7 @@ TRACE_EVENT(file_check_and_advance_wb_err, > __entry->new = file->f_wb_err; > ), > > - TP_printk("file=%p dev=%d:%d ino=0x%lx old=0x%x new=0x%x", > + TP_printk("file=%p dev=%d:%d ino=0x%llx old=0x%x new=0x%x", > __entry->file, MAJOR(__entry->s_dev), > MINOR(__entry->s_dev), __entry->i_ino, __entry->old, > __entry->new) > diff --git a/include/trace/events/fs_dax.h b/include/trace/events/fs_dax.h > index > 50ebc1290ab062a9c30ab00049fb96691f9a0f23..11121baa8ece7928c653b4f874fb10ffbdd02fd0 > 100644 > --- a/include/trace/events/fs_dax.h > +++ b/include/trace/events/fs_dax.h > @@ -12,7 +12,7 @@ DECLARE_EVENT_CLASS(dax_pmd_fault_class, > pgoff_t max_pgoff, int result), > TP_ARGS(inode, vmf, max_pgoff, result), > TP_STRUCT__entry( > - __field(unsigned long, ino) > + __field(u64, ino) > __field(unsigned long, vm_start) > __field(unsigned long, vm_end) > __field(vm_flags_t, vm_flags) > @@ -35,7 +35,7 @@ DECLARE_EVENT_CLASS(dax_pmd_fault_class, > __entry->max_pgoff = max_pgoff; > __entry->result = result; > ), > - TP_printk("dev %d:%d ino %#lx %s %s address %#lx vm_start " > + TP_printk("dev %d:%d ino %#llx %s %s address %#lx vm_start " > "%#lx vm_end %#lx pgoff %#lx max_pgoff %#lx %s", > MAJOR(__entry->dev), > MINOR(__entry->dev), > @@ -66,7 +66,7 @@ DECLARE_EVENT_CLASS(dax_pmd_load_hole_class, > void *radix_entry), > TP_ARGS(inode, vmf, zero_folio, radix_entry), > TP_STRUCT__entry( > - __field(unsigned long, ino) > + __field(u64, ino) > __field(vm_flags_t, vm_flags) > __field(unsigned long, address) > __field(struct folio *, zero_folio) > @@ -81,7 +81,7 @@ DECLARE_EVENT_CLASS(dax_pmd_load_hole_class, > __entry->zero_folio = zero_folio; > __entry->radix_entry = radix_entry; > ), > - TP_printk("dev %d:%d ino %#lx %s address %#lx zero_folio %p " > + TP_printk("dev %d:%d ino %#llx %s address %#lx zero_folio %p " > "radix_entry %#lx", > MAJOR(__entry->dev), > MINOR(__entry->dev), > @@ -106,7 +106,7 @@ DECLARE_EVENT_CLASS(dax_pte_fault_class, > TP_PROTO(struct inode *inode, struct vm_fault *vmf, int result), > TP_ARGS(inode, vmf, result), > TP_STRUCT__entry( > - __field(unsigned long, ino) > + __field(u64, ino) > __field(vm_flags_t, vm_flags) > __field(unsigned long, address) > __field(pgoff_t, pgoff) > @@ -123,7 +123,7 @@ DECLARE_EVENT_CLASS(dax_pte_fault_class, > __entry->pgoff = vmf->pgoff; > __entry->result = result; > ), > - TP_printk("dev %d:%d ino %#lx %s %s address %#lx pgoff %#lx %s", > + TP_printk("dev %d:%d ino %#llx %s %s address %#lx pgoff %#lx %s", > MAJOR(__entry->dev), > MINOR(__entry->dev), > __entry->ino, > @@ -150,7 +150,7 @@ DECLARE_EVENT_CLASS(dax_writeback_range_class, > TP_PROTO(struct inode *inode, pgoff_t start_index, pgoff_t end_index), > TP_ARGS(inode, start_index, end_index), > TP_STRUCT__entry( > - __field(unsigned long, ino) > + __field(u64, ino) > __field(pgoff_t, start_index) > __field(pgoff_t, end_index) > __field(dev_t, dev) > @@ -161,7 +161,7 @@ DECLARE_EVENT_CLASS(dax_writeback_range_class, > __entry->start_index = start_index; > __entry->end_index = end_index; > ), > - TP_printk("dev %d:%d ino %#lx pgoff %#lx-%#lx", > + TP_printk("dev %d:%d ino %#llx pgoff %#lx-%#lx", > MAJOR(__entry->dev), > MINOR(__entry->dev), > __entry->ino, > @@ -182,7 +182,7 @@ TRACE_EVENT(dax_writeback_one, > TP_PROTO(struct inode *inode, pgoff_t pgoff, pgoff_t pglen), > TP_ARGS(inode, pgoff, pglen), > TP_STRUCT__entry( > - __field(unsigned long, ino) > + __field(u64, ino) > __field(pgoff_t, pgoff) > __field(pgoff_t, pglen) > __field(dev_t, dev) > @@ -193,7 +193,7 @@ TRACE_EVENT(dax_writeback_one, > __entry->pgoff = pgoff; > __entry->pglen = pglen; > ), > - TP_printk("dev %d:%d ino %#lx pgoff %#lx pglen %#lx", > + TP_printk("dev %d:%d ino %#llx pgoff %#lx pglen %#lx", > MAJOR(__entry->dev), > MINOR(__entry->dev), > __entry->ino, > diff --git a/include/trace/events/fsverity.h b/include/trace/events/fsverity.h > index > a8c52f21cbd5eb010c7e7b2fdb8f9de49c8ea326..4477c17e05748360965c4e1840590efe96d6335e > 100644 > --- a/include/trace/events/fsverity.h > +++ b/include/trace/events/fsverity.h > @@ -16,7 +16,7 @@ TRACE_EVENT(fsverity_enable, > const struct merkle_tree_params *params), > TP_ARGS(inode, params), > TP_STRUCT__entry( > - __field(ino_t, ino) > + __field(u64, ino) > __field(u64, data_size) > __field(u64, tree_size) > __field(unsigned int, merkle_block) > @@ -29,8 +29,8 @@ TRACE_EVENT(fsverity_enable, > __entry->merkle_block = params->block_size; > __entry->num_levels = params->num_levels; > ), > - TP_printk("ino %lu data_size %llu tree_size %llu merkle_block %u levels > %u", > - (unsigned long) __entry->ino, > + TP_printk("ino %llu data_size %llu tree_size %llu merkle_block %u > levels %u", > + __entry->ino, > __entry->data_size, > __entry->tree_size, > __entry->merkle_block, > @@ -42,7 +42,7 @@ TRACE_EVENT(fsverity_tree_done, > const struct merkle_tree_params *params), > TP_ARGS(inode, vi, params), > TP_STRUCT__entry( > - __field(ino_t, ino) > + __field(u64, ino) > __field(u64, data_size) > __field(u64, tree_size) > __field(unsigned int, merkle_block) > @@ -59,8 +59,8 @@ TRACE_EVENT(fsverity_tree_done, > memcpy(__get_dynamic_array(root_hash), vi->root_hash, > __get_dynamic_array_len(root_hash)); > memcpy(__get_dynamic_array(file_digest), vi->file_digest, > __get_dynamic_array_len(file_digest)); > ), > - TP_printk("ino %lu data_size %llu tree_size %lld merkle_block %u levels > %u root_hash %s digest %s", > - (unsigned long) __entry->ino, > + TP_printk("ino %llu data_size %llu tree_size %lld merkle_block %u > levels %u root_hash %s digest %s", > + __entry->ino, > __entry->data_size, > __entry->tree_size, > __entry->merkle_block, > @@ -75,7 +75,7 @@ TRACE_EVENT(fsverity_verify_data_block, > u64 data_pos), > TP_ARGS(inode, params, data_pos), > TP_STRUCT__entry( > - __field(ino_t, ino) > + __field(u64, ino) > __field(u64, data_pos) > __field(unsigned int, merkle_block) > ), > @@ -84,8 +84,8 @@ TRACE_EVENT(fsverity_verify_data_block, > __entry->data_pos = data_pos; > __entry->merkle_block = params->block_size; > ), > - TP_printk("ino %lu data_pos %llu merkle_block %u", > - (unsigned long) __entry->ino, > + TP_printk("ino %llu data_pos %llu merkle_block %u", > + __entry->ino, > __entry->data_pos, > __entry->merkle_block) > ); > @@ -96,7 +96,7 @@ TRACE_EVENT(fsverity_merkle_hit, > unsigned int hidx), > TP_ARGS(inode, data_pos, hblock_idx, level, hidx), > TP_STRUCT__entry( > - __field(ino_t, ino) > + __field(u64, ino) > __field(u64, data_pos) > __field(unsigned long, hblock_idx) > __field(unsigned int, level) > @@ -109,8 +109,8 @@ TRACE_EVENT(fsverity_merkle_hit, > __entry->level = level; > __entry->hidx = hidx; > ), > - TP_printk("ino %lu data_pos %llu hblock_idx %lu level %u hidx %u", > - (unsigned long) __entry->ino, > + TP_printk("ino %llu data_pos %llu hblock_idx %lu level %u hidx %u", > + __entry->ino, > __entry->data_pos, > __entry->hblock_idx, > __entry->level, > @@ -122,7 +122,7 @@ TRACE_EVENT(fsverity_verify_merkle_block, > unsigned int level, unsigned int hidx), > TP_ARGS(inode, hblock_idx, level, hidx), > TP_STRUCT__entry( > - __field(ino_t, ino) > + __field(u64, ino) > __field(unsigned long, hblock_idx) > __field(unsigned int, level) > __field(unsigned int, hidx) > @@ -133,8 +133,8 @@ TRACE_EVENT(fsverity_verify_merkle_block, > __entry->level = level; > __entry->hidx = hidx; > ), > - TP_printk("ino %lu hblock_idx %lu level %u hidx %u", > - (unsigned long) __entry->ino, > + TP_printk("ino %llu hblock_idx %lu level %u hidx %u", > + __entry->ino, > __entry->hblock_idx, > __entry->level, > __entry->hidx) > diff --git a/include/trace/events/netfs.h b/include/trace/events/netfs.h > index > 2d366be46a1c30feba5ac2368492d7671687a229..8add6d35e648b789db3dce464faf7db1df151ad0 > 100644 > --- a/include/trace/events/netfs.h > +++ b/include/trace/events/netfs.h > @@ -300,7 +300,7 @@ TRACE_EVENT(netfs_read, > __field(loff_t, start) > __field(size_t, len) > __field(enum netfs_read_trace, what) > - __field(unsigned int, netfs_inode) > + __field(u64, netfs_inode) > ), > > TP_fast_assign( > @@ -313,7 +313,7 @@ TRACE_EVENT(netfs_read, > __entry->netfs_inode = rreq->inode->i_ino; > ), > > - TP_printk("R=%08x %s c=%08x ni=%x s=%llx l=%zx sz=%llx", > + TP_printk("R=%08x %s c=%08x ni=%llx s=%llx l=%zx sz=%llx", > __entry->rreq, > __print_symbolic(__entry->what, netfs_read_traces), > __entry->cookie, > @@ -486,7 +486,7 @@ TRACE_EVENT(netfs_folio, > TP_ARGS(folio, why), > > TP_STRUCT__entry( > - __field(ino_t, ino) > + __field(u64, ino) > __field(pgoff_t, index) > __field(unsigned int, nr) > __field(enum netfs_folio_trace, why) > @@ -500,7 +500,7 @@ TRACE_EVENT(netfs_folio, > __entry->nr = folio_nr_pages(folio); > ), > > - TP_printk("i=%05lx ix=%05lx-%05lx %s", > + TP_printk("i=%05llx ix=%05lx-%05lx %s", > __entry->ino, __entry->index, __entry->index + > __entry->nr - 1, > __print_symbolic(__entry->why, netfs_folio_traces)) > ); > diff --git a/include/trace/events/readahead.h > b/include/trace/events/readahead.h > index > 0997ac5eceab1ac2de3b84b9d9d59cc338b9dd2b..087f171e2b02d30f09179d5ed6c27a7e0224370b > 100644 > --- a/include/trace/events/readahead.h > +++ b/include/trace/events/readahead.h > @@ -18,7 +18,7 @@ TRACE_EVENT(page_cache_ra_unbounded, > TP_ARGS(inode, index, nr_to_read, lookahead_size), > > TP_STRUCT__entry( > - __field(unsigned long, i_ino) > + __field(u64, i_ino) > __field(dev_t, s_dev) > __field(pgoff_t, index) > __field(unsigned long, nr_to_read) > @@ -34,7 +34,7 @@ TRACE_EVENT(page_cache_ra_unbounded, > ), > > TP_printk( > - "dev=%d:%d ino=%lx index=%lu nr_to_read=%lu lookahead_size=%lu", > + "dev=%d:%d ino=%llx index=%lu nr_to_read=%lu > lookahead_size=%lu", > MAJOR(__entry->s_dev), MINOR(__entry->s_dev), __entry->i_ino, > __entry->index, __entry->nr_to_read, __entry->lookahead_size > ) > @@ -46,7 +46,7 @@ TRACE_EVENT(page_cache_ra_order, > TP_ARGS(inode, index, ra), > > TP_STRUCT__entry( > - __field(unsigned long, i_ino) > + __field(u64, i_ino) > __field(dev_t, s_dev) > __field(pgoff_t, index) > __field(unsigned int, order) > @@ -66,7 +66,7 @@ TRACE_EVENT(page_cache_ra_order, > ), > > TP_printk( > - "dev=%d:%d ino=%lx index=%lu order=%u size=%u async_size=%u > ra_pages=%u", > + "dev=%d:%d ino=%llx index=%lu order=%u size=%u async_size=%u > ra_pages=%u", > MAJOR(__entry->s_dev), MINOR(__entry->s_dev), __entry->i_ino, > __entry->index, __entry->order, __entry->size, > __entry->async_size, __entry->ra_pages > @@ -80,16 +80,16 @@ DECLARE_EVENT_CLASS(page_cache_ra_op, > TP_ARGS(inode, index, ra, req_count), > > TP_STRUCT__entry( > - __field(unsigned long, i_ino) > - __field(dev_t, s_dev) > + __field(u64, i_ino) > + __field(loff_t, prev_pos) > __field(pgoff_t, index) > + __field(unsigned long, req_count) > + __field(dev_t, s_dev) > __field(unsigned int, order) > __field(unsigned int, size) > __field(unsigned int, async_size) > __field(unsigned int, ra_pages) > __field(unsigned int, mmap_miss) > - __field(loff_t, prev_pos) > - __field(unsigned long, req_count) > ), > > TP_fast_assign( > @@ -106,7 +106,7 @@ DECLARE_EVENT_CLASS(page_cache_ra_op, > ), > > TP_printk( > - "dev=%d:%d ino=%lx index=%lu req_count=%lu order=%u size=%u > async_size=%u ra_pages=%u mmap_miss=%u prev_pos=%lld", > + "dev=%d:%d ino=%llx index=%lu req_count=%lu order=%u size=%u > async_size=%u ra_pages=%u mmap_miss=%u prev_pos=%lld", > MAJOR(__entry->s_dev), MINOR(__entry->s_dev), __entry->i_ino, > __entry->index, __entry->req_count, __entry->order, > __entry->size, __entry->async_size, __entry->ra_pages, > diff --git a/include/trace/events/timestamp.h > b/include/trace/events/timestamp.h > index > c9e5ec930054887a6a7bae8e487611b5ded33d71..d6503612dddf9c6a2f785fad549fa04adddb06fe > 100644 > --- a/include/trace/events/timestamp.h > +++ b/include/trace/events/timestamp.h > @@ -18,9 +18,9 @@ DECLARE_EVENT_CLASS(ctime, > TP_ARGS(inode, ctime), > > TP_STRUCT__entry( > - __field(dev_t, dev) > - __field(ino_t, ino) > + __field(u64, ino) > __field(time64_t, ctime_s) > + __field(dev_t, dev) > __field(u32, ctime_ns) > __field(u32, gen) > ), > @@ -33,7 +33,7 @@ DECLARE_EVENT_CLASS(ctime, > __entry->ctime_ns = ctime->tv_nsec; > ), > > - TP_printk("ino=%d:%d:%ld:%u ctime=%lld.%u", > + TP_printk("ino=%d:%d:%llu:%u ctime=%lld.%u", > MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino, > __entry->gen, > __entry->ctime_s, __entry->ctime_ns > ) > @@ -58,8 +58,8 @@ TRACE_EVENT(ctime_ns_xchg, > TP_ARGS(inode, old, new, cur), > > TP_STRUCT__entry( > + __field(u64, ino) > __field(dev_t, dev) > - __field(ino_t, ino) > __field(u32, gen) > __field(u32, old) > __field(u32, new) > @@ -75,7 +75,7 @@ TRACE_EVENT(ctime_ns_xchg, > __entry->cur = cur; > ), > > - TP_printk("ino=%d:%d:%ld:%u old=%u:%s new=%u cur=%u:%s", > + TP_printk("ino=%d:%d:%llu:%u old=%u:%s new=%u cur=%u:%s", > MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino, > __entry->gen, > __entry->old & ~I_CTIME_QUERIED, > __print_flags(__entry->old & I_CTIME_QUERIED, "|", > CTIME_QUERIED_FLAGS), > @@ -93,10 +93,10 @@ TRACE_EVENT(fill_mg_cmtime, > TP_ARGS(inode, ctime, mtime), > > TP_STRUCT__entry( > - __field(dev_t, dev) > - __field(ino_t, ino) > + __field(u64, ino) > __field(time64_t, ctime_s) > __field(time64_t, mtime_s) > + __field(dev_t, dev) > __field(u32, ctime_ns) > __field(u32, mtime_ns) > __field(u32, gen) > @@ -112,7 +112,7 @@ TRACE_EVENT(fill_mg_cmtime, > __entry->mtime_ns = mtime->tv_nsec; > ), > > - TP_printk("ino=%d:%d:%ld:%u ctime=%lld.%u mtime=%lld.%u", > + TP_printk("ino=%d:%d:%llu:%u ctime=%lld.%u mtime=%lld.%u", > MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino, > __entry->gen, > __entry->ctime_s, __entry->ctime_ns, > __entry->mtime_s, __entry->mtime_ns > diff --git a/include/trace/events/writeback.h > b/include/trace/events/writeback.h > index > 4d3d8c8f3a1bc3e5ef10fc96e3c6dbbd0cf00c98..e5cd2b80fd29dba9177b8ea7c37d63e50e9f60e2 > 100644 > --- a/include/trace/events/writeback.h > +++ b/include/trace/events/writeback.h > @@ -67,7 +67,7 @@ DECLARE_EVENT_CLASS(writeback_folio_template, > > TP_STRUCT__entry ( > __array(char, name, 32) > - __field(ino_t, ino) > + __field(u64, ino) > __field(pgoff_t, index) > ), > > @@ -79,9 +79,9 @@ DECLARE_EVENT_CLASS(writeback_folio_template, > __entry->index = folio->index; > ), > > - TP_printk("bdi %s: ino=%lu index=%lu", > + TP_printk("bdi %s: ino=%llu index=%lu", > __entry->name, > - (unsigned long)__entry->ino, > + __entry->ino, > __entry->index > ) > ); > @@ -108,7 +108,7 @@ DECLARE_EVENT_CLASS(writeback_dirty_inode_template, > > TP_STRUCT__entry ( > __array(char, name, 32) > - __field(ino_t, ino) > + __field(u64, ino) > __field(unsigned long, state) > __field(unsigned long, flags) > ), > @@ -123,9 +123,9 @@ DECLARE_EVENT_CLASS(writeback_dirty_inode_template, > __entry->flags = flags; > ), > > - TP_printk("bdi %s: ino=%lu state=%s flags=%s", > + TP_printk("bdi %s: ino=%llu state=%s flags=%s", > __entry->name, > - (unsigned long)__entry->ino, > + __entry->ino, > show_inode_state(__entry->state), > show_inode_state(__entry->flags) > ) > @@ -155,12 +155,12 @@ DEFINE_EVENT(writeback_dirty_inode_template, > writeback_dirty_inode, > #ifdef CREATE_TRACE_POINTS > #ifdef CONFIG_CGROUP_WRITEBACK > > -static inline ino_t __trace_wb_assign_cgroup(struct bdi_writeback *wb) > +static inline u64 __trace_wb_assign_cgroup(struct bdi_writeback *wb) > { > return cgroup_ino(wb->memcg_css->cgroup); > } > > -static inline ino_t __trace_wbc_assign_cgroup(struct writeback_control *wbc) > +static inline u64 __trace_wbc_assign_cgroup(struct writeback_control *wbc) > { > if (wbc->wb) > return __trace_wb_assign_cgroup(wbc->wb); > @@ -169,12 +169,12 @@ static inline ino_t __trace_wbc_assign_cgroup(struct > writeback_control *wbc) > } > #else /* CONFIG_CGROUP_WRITEBACK */ > > -static inline ino_t __trace_wb_assign_cgroup(struct bdi_writeback *wb) > +static inline u64 __trace_wb_assign_cgroup(struct bdi_writeback *wb) > { > return 1; > } > > -static inline ino_t __trace_wbc_assign_cgroup(struct writeback_control *wbc) > +static inline u64 __trace_wbc_assign_cgroup(struct writeback_control *wbc) > { > return 1; > } > @@ -192,8 +192,8 @@ TRACE_EVENT(inode_foreign_history, > > TP_STRUCT__entry( > __array(char, name, 32) > - __field(ino_t, ino) > - __field(ino_t, cgroup_ino) > + __field(u64, ino) > + __field(u64, cgroup_ino) > __field(unsigned int, history) > ), > > @@ -204,10 +204,10 @@ TRACE_EVENT(inode_foreign_history, > __entry->history = history; > ), > > - TP_printk("bdi %s: ino=%lu cgroup_ino=%lu history=0x%x", > + TP_printk("bdi %s: ino=%llu cgroup_ino=%llu history=0x%x", > __entry->name, > - (unsigned long)__entry->ino, > - (unsigned long)__entry->cgroup_ino, > + __entry->ino, > + __entry->cgroup_ino, > __entry->history > ) > ); > @@ -221,8 +221,8 @@ TRACE_EVENT(inode_switch_wbs_queue, > > TP_STRUCT__entry( > __array(char, name, 32) > - __field(ino_t, old_cgroup_ino) > - __field(ino_t, new_cgroup_ino) > + __field(u64, old_cgroup_ino) > + __field(u64, new_cgroup_ino) > __field(unsigned int, count) > ), > > @@ -233,10 +233,10 @@ TRACE_EVENT(inode_switch_wbs_queue, > __entry->count = count; > ), > > - TP_printk("bdi %s: old_cgroup_ino=%lu new_cgroup_ino=%lu count=%u", > + TP_printk("bdi %s: old_cgroup_ino=%llu new_cgroup_ino=%llu count=%u", > __entry->name, > - (unsigned long)__entry->old_cgroup_ino, > - (unsigned long)__entry->new_cgroup_ino, > + __entry->old_cgroup_ino, > + __entry->new_cgroup_ino, > __entry->count > ) > ); > @@ -250,9 +250,9 @@ TRACE_EVENT(inode_switch_wbs, > > TP_STRUCT__entry( > __array(char, name, 32) > - __field(ino_t, ino) > - __field(ino_t, old_cgroup_ino) > - __field(ino_t, new_cgroup_ino) > + __field(u64, ino) > + __field(u64, old_cgroup_ino) > + __field(u64, new_cgroup_ino) > ), > > TP_fast_assign( > @@ -262,11 +262,11 @@ TRACE_EVENT(inode_switch_wbs, > __entry->new_cgroup_ino = __trace_wb_assign_cgroup(new_wb); > ), > > - TP_printk("bdi %s: ino=%lu old_cgroup_ino=%lu new_cgroup_ino=%lu", > + TP_printk("bdi %s: ino=%llu old_cgroup_ino=%llu new_cgroup_ino=%llu", > __entry->name, > - (unsigned long)__entry->ino, > - (unsigned long)__entry->old_cgroup_ino, > - (unsigned long)__entry->new_cgroup_ino > + __entry->ino, > + __entry->old_cgroup_ino, > + __entry->new_cgroup_ino > ) > ); > > @@ -279,10 +279,10 @@ TRACE_EVENT(track_foreign_dirty, > TP_STRUCT__entry( > __array(char, name, 32) > __field(u64, bdi_id) > - __field(ino_t, ino) > + __field(u64, ino) > + __field(u64, cgroup_ino) > + __field(u64, page_cgroup_ino) > __field(unsigned int, memcg_id) > - __field(ino_t, cgroup_ino) > - __field(ino_t, page_cgroup_ino) > ), > > TP_fast_assign( > @@ -297,13 +297,13 @@ TRACE_EVENT(track_foreign_dirty, > __entry->page_cgroup_ino = > cgroup_ino(folio_memcg(folio)->css.cgroup); > ), > > - TP_printk("bdi %s[%llu]: ino=%lu memcg_id=%u cgroup_ino=%lu > page_cgroup_ino=%lu", > + TP_printk("bdi %s[%llu]: ino=%llu memcg_id=%u cgroup_ino=%llu > page_cgroup_ino=%llu", > __entry->name, > __entry->bdi_id, > - (unsigned long)__entry->ino, > + __entry->ino, > __entry->memcg_id, > - (unsigned long)__entry->cgroup_ino, > - (unsigned long)__entry->page_cgroup_ino > + __entry->cgroup_ino, > + __entry->page_cgroup_ino > ) > ); > > @@ -316,7 +316,7 @@ TRACE_EVENT(flush_foreign, > > TP_STRUCT__entry( > __array(char, name, 32) > - __field(ino_t, cgroup_ino) > + __field(u64, cgroup_ino) > __field(unsigned int, frn_bdi_id) > __field(unsigned int, frn_memcg_id) > ), > @@ -328,9 +328,9 @@ TRACE_EVENT(flush_foreign, > __entry->frn_memcg_id = frn_memcg_id; > ), > > - TP_printk("bdi %s: cgroup_ino=%lu frn_bdi_id=%u frn_memcg_id=%u", > + TP_printk("bdi %s: cgroup_ino=%llu frn_bdi_id=%u frn_memcg_id=%u", > __entry->name, > - (unsigned long)__entry->cgroup_ino, > + __entry->cgroup_ino, > __entry->frn_bdi_id, > __entry->frn_memcg_id > ) > @@ -345,9 +345,9 @@ DECLARE_EVENT_CLASS(writeback_write_inode_template, > > TP_STRUCT__entry ( > __array(char, name, 32) > - __field(ino_t, ino) > + __field(u64, ino) > + __field(u64, cgroup_ino) > __field(int, sync_mode) > - __field(ino_t, cgroup_ino) > ), > > TP_fast_assign( > @@ -358,11 +358,11 @@ DECLARE_EVENT_CLASS(writeback_write_inode_template, > __entry->cgroup_ino = __trace_wbc_assign_cgroup(wbc); > ), > > - TP_printk("bdi %s: ino=%lu sync_mode=%d cgroup_ino=%lu", > + TP_printk("bdi %s: ino=%llu sync_mode=%d cgroup_ino=%llu", > __entry->name, > - (unsigned long)__entry->ino, > + __entry->ino, > __entry->sync_mode, > - (unsigned long)__entry->cgroup_ino > + __entry->cgroup_ino > ) > ); > > @@ -385,6 +385,7 @@ DECLARE_EVENT_CLASS(writeback_work_class, > TP_ARGS(wb, work), > TP_STRUCT__entry( > __array(char, name, 32) > + __field(u64, cgroup_ino) > __field(long, nr_pages) > __field(dev_t, sb_dev) > __field(int, sync_mode) > @@ -392,7 +393,6 @@ DECLARE_EVENT_CLASS(writeback_work_class, > __field(int, range_cyclic) > __field(int, for_background) > __field(int, reason) > - __field(ino_t, cgroup_ino) > ), > TP_fast_assign( > strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32); > @@ -406,7 +406,7 @@ DECLARE_EVENT_CLASS(writeback_work_class, > __entry->cgroup_ino = __trace_wb_assign_cgroup(wb); > ), > TP_printk("bdi %s: sb_dev %d:%d nr_pages=%ld sync_mode=%d " > - "kupdate=%d range_cyclic=%d background=%d reason=%s > cgroup_ino=%lu", > + "kupdate=%d range_cyclic=%d background=%d reason=%s > cgroup_ino=%llu", > __entry->name, > MAJOR(__entry->sb_dev), MINOR(__entry->sb_dev), > __entry->nr_pages, > @@ -415,7 +415,7 @@ DECLARE_EVENT_CLASS(writeback_work_class, > __entry->range_cyclic, > __entry->for_background, > __print_symbolic(__entry->reason, WB_WORK_REASON), > - (unsigned long)__entry->cgroup_ino > + __entry->cgroup_ino > ) > ); > #define DEFINE_WRITEBACK_WORK_EVENT(name) \ > @@ -445,15 +445,15 @@ DECLARE_EVENT_CLASS(writeback_class, > TP_ARGS(wb), > TP_STRUCT__entry( > __array(char, name, 32) > - __field(ino_t, cgroup_ino) > + __field(u64, cgroup_ino) > ), > TP_fast_assign( > strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32); > __entry->cgroup_ino = __trace_wb_assign_cgroup(wb); > ), > - TP_printk("bdi %s: cgroup_ino=%lu", > + TP_printk("bdi %s: cgroup_ino=%llu", > __entry->name, > - (unsigned long)__entry->cgroup_ino > + __entry->cgroup_ino > ) > ); > #define DEFINE_WRITEBACK_EVENT(name) \ > @@ -482,15 +482,15 @@ DECLARE_EVENT_CLASS(wbc_class, > TP_ARGS(wbc, bdi), > TP_STRUCT__entry( > __array(char, name, 32) > + __field(u64, cgroup_ino) > __field(long, nr_to_write) > __field(long, pages_skipped) > + __field(long, range_start) > + __field(long, range_end) > __field(int, sync_mode) > __field(int, for_kupdate) > __field(int, for_background) > __field(int, range_cyclic) > - __field(long, range_start) > - __field(long, range_end) > - __field(ino_t, cgroup_ino) > ), > > TP_fast_assign( > @@ -507,7 +507,7 @@ DECLARE_EVENT_CLASS(wbc_class, > ), > > TP_printk("bdi %s: towrt=%ld skip=%ld mode=%d kupd=%d bgrd=%d " > - "cyclic=%d start=0x%lx end=0x%lx cgroup_ino=%lu", > + "cyclic=%d start=0x%lx end=0x%lx cgroup_ino=%llu", > __entry->name, > __entry->nr_to_write, > __entry->pages_skipped, > @@ -517,7 +517,7 @@ DECLARE_EVENT_CLASS(wbc_class, > __entry->range_cyclic, > __entry->range_start, > __entry->range_end, > - (unsigned long)__entry->cgroup_ino > + __entry->cgroup_ino > ) > ) > > @@ -535,11 +535,11 @@ TRACE_EVENT(writeback_queue_io, > TP_ARGS(wb, work, dirtied_before, moved), > TP_STRUCT__entry( > __array(char, name, 32) > + __field(u64, cgroup_ino) > __field(unsigned long, older) > __field(long, age) > __field(int, moved) > __field(int, reason) > - __field(ino_t, cgroup_ino) > ), > TP_fast_assign( > strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32); > @@ -549,13 +549,13 @@ TRACE_EVENT(writeback_queue_io, > __entry->reason = work->reason; > __entry->cgroup_ino = __trace_wb_assign_cgroup(wb); > ), > - TP_printk("bdi %s: older=%lu age=%ld enqueue=%d reason=%s > cgroup_ino=%lu", > + TP_printk("bdi %s: older=%lu age=%ld enqueue=%d reason=%s > cgroup_ino=%llu", > __entry->name, > __entry->older, /* dirtied_before in jiffies */ > __entry->age, /* dirtied_before in relative milliseconds */ > __entry->moved, > __print_symbolic(__entry->reason, WB_WORK_REASON), > - (unsigned long)__entry->cgroup_ino > + __entry->cgroup_ino > ) > ); > > @@ -614,13 +614,13 @@ TRACE_EVENT(bdi_dirty_ratelimit, > > TP_STRUCT__entry( > __array(char, bdi, 32) > + __field(u64, cgroup_ino) > __field(unsigned long, write_bw) > __field(unsigned long, avg_write_bw) > __field(unsigned long, dirty_rate) > __field(unsigned long, dirty_ratelimit) > __field(unsigned long, task_ratelimit) > __field(unsigned long, balanced_dirty_ratelimit) > - __field(ino_t, cgroup_ino) > ), > > TP_fast_assign( > @@ -638,7 +638,7 @@ TRACE_EVENT(bdi_dirty_ratelimit, > TP_printk("bdi %s: " > "write_bw=%lu awrite_bw=%lu dirty_rate=%lu " > "dirty_ratelimit=%lu task_ratelimit=%lu " > - "balanced_dirty_ratelimit=%lu cgroup_ino=%lu", > + "balanced_dirty_ratelimit=%lu cgroup_ino=%llu", > __entry->bdi, > __entry->write_bw, /* write bandwidth */ > __entry->avg_write_bw, /* avg write bandwidth */ > @@ -646,7 +646,7 @@ TRACE_EVENT(bdi_dirty_ratelimit, > __entry->dirty_ratelimit, /* base ratelimit */ > __entry->task_ratelimit, /* ratelimit with position control */ > __entry->balanced_dirty_ratelimit, /* the balanced ratelimit > */ > - (unsigned long)__entry->cgroup_ino > + __entry->cgroup_ino > ) > ); > > @@ -667,6 +667,7 @@ TRACE_EVENT(balance_dirty_pages, > > TP_STRUCT__entry( > __array( char, bdi, 32) > + __field(u64, cgroup_ino) > __field(unsigned long, limit) > __field(unsigned long, setpoint) > __field(unsigned long, dirty) > @@ -674,13 +675,12 @@ TRACE_EVENT(balance_dirty_pages, > __field(unsigned long, wb_dirty) > __field(unsigned long, dirty_ratelimit) > __field(unsigned long, task_ratelimit) > - __field(unsigned int, dirtied) > - __field(unsigned int, dirtied_pause) > __field(unsigned long, paused) > __field( long, pause) > __field(unsigned long, period) > __field( long, think) > - __field(ino_t, cgroup_ino) > + __field(unsigned int, dirtied) > + __field(unsigned int, dirtied_pause) > ), > > TP_fast_assign( > @@ -711,7 +711,7 @@ TRACE_EVENT(balance_dirty_pages, > "wb_setpoint=%lu wb_dirty=%lu " > "dirty_ratelimit=%lu task_ratelimit=%lu " > "dirtied=%u dirtied_pause=%u " > - "paused=%lu pause=%ld period=%lu think=%ld cgroup_ino=%lu", > + "paused=%lu pause=%ld period=%lu think=%ld cgroup_ino=%llu", > __entry->bdi, > __entry->limit, > __entry->setpoint, > @@ -726,7 +726,7 @@ TRACE_EVENT(balance_dirty_pages, > __entry->pause, /* ms */ > __entry->period, /* ms */ > __entry->think, /* ms */ > - (unsigned long)__entry->cgroup_ino > + __entry->cgroup_ino > ) > ); > > @@ -737,10 +737,10 @@ TRACE_EVENT(writeback_sb_inodes_requeue, > > TP_STRUCT__entry( > __array(char, name, 32) > - __field(ino_t, ino) > + __field(u64, ino) > + __field(u64, cgroup_ino) > __field(unsigned long, state) > __field(unsigned long, dirtied_when) > - __field(ino_t, cgroup_ino) > ), > > TP_fast_assign( > @@ -752,13 +752,13 @@ TRACE_EVENT(writeback_sb_inodes_requeue, > __entry->cgroup_ino = > __trace_wb_assign_cgroup(inode_to_wb(inode)); > ), > > - TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu > cgroup_ino=%lu", > + TP_printk("bdi %s: ino=%llu state=%s dirtied_when=%lu age=%lu > cgroup_ino=%llu", > __entry->name, > - (unsigned long)__entry->ino, > + __entry->ino, > show_inode_state(__entry->state), > __entry->dirtied_when, > (jiffies - __entry->dirtied_when) / HZ, > - (unsigned long)__entry->cgroup_ino > + __entry->cgroup_ino > ) > ); > > @@ -773,13 +773,13 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template, > > TP_STRUCT__entry( > __array(char, name, 32) > - __field(ino_t, ino) > + __field(u64, ino) > + __field(u64, cgroup_ino) > __field(unsigned long, state) > __field(unsigned long, dirtied_when) > __field(unsigned long, writeback_index) > - __field(long, nr_to_write) > __field(unsigned long, wrote) > - __field(ino_t, cgroup_ino) > + __field(long, nr_to_write) > ), > > TP_fast_assign( > @@ -794,17 +794,17 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template, > __entry->cgroup_ino = __trace_wbc_assign_cgroup(wbc); > ), > > - TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu " > - "index=%lu to_write=%ld wrote=%lu cgroup_ino=%lu", > + TP_printk("bdi %s: ino=%llu state=%s dirtied_when=%lu age=%lu " > + "index=%lu to_write=%ld wrote=%lu cgroup_ino=%llu", > __entry->name, > - (unsigned long)__entry->ino, > + __entry->ino, > show_inode_state(__entry->state), > __entry->dirtied_when, > (jiffies - __entry->dirtied_when) / HZ, > __entry->writeback_index, > __entry->nr_to_write, > __entry->wrote, > - (unsigned long)__entry->cgroup_ino > + __entry->cgroup_ino > ) > ); > > @@ -828,11 +828,11 @@ DECLARE_EVENT_CLASS(writeback_inode_template, > TP_ARGS(inode), > > TP_STRUCT__entry( > - __field( dev_t, dev ) > - __field( ino_t, ino ) > + __field( u64, ino ) > __field(unsigned long, state ) > - __field( __u16, mode ) > __field(unsigned long, dirtied_when ) > + __field( dev_t, dev ) > + __field( __u16, mode ) > ), > > TP_fast_assign( > @@ -843,9 +843,9 @@ DECLARE_EVENT_CLASS(writeback_inode_template, > __entry->dirtied_when = inode->dirtied_when; > ), > > - TP_printk("dev %d,%d ino %lu dirtied %lu state %s mode 0%o", > + TP_printk("dev %d,%d ino %llu dirtied %lu state %s mode 0%o", > MAJOR(__entry->dev), MINOR(__entry->dev), > - (unsigned long)__entry->ino, __entry->dirtied_when, > + __entry->ino, __entry->dirtied_when, > show_inode_state(__entry->state), __entry->mode) > ); > > > -- > 2.53.0 > -- Jan Kara <[email protected]> SUSE Labs, CR
