aboutsummaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-07 17:36:39 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-07 17:36:39 -0400
commit6432f2128414edbea5fd4f6c4fa4c28d0e1c6151 (patch)
treed3c63c5f2f043ce52d98d8dfd3c9c0a7bc76ed95 /include/trace
parent1b033447bf847ba49c3816c564c9191c97456b36 (diff)
parentc278531d39f3158bfee93dc67da0b77e09776de2 (diff)
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 updates from Ted Ts'o: "The big new feature added this time is supporting online resizing using the meta_bg feature. This allows us to resize file systems which are greater than 16TB. In addition, the speed of online resizing has been improved in general. We also fix a number of races, some of which could lead to deadlocks, in ext4's Asynchronous I/O and online defrag support, thanks to good work by Dmitry Monakhov. There are also a large number of more minor bug fixes and cleanups from a number of other ext4 contributors, quite of few of which have submitted fixes for the first time." * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (69 commits) ext4: fix ext4_flush_completed_IO wait semantics ext4: fix mtime update in nodelalloc mode ext4: fix ext_remove_space for punch_hole case ext4: punch_hole should wait for DIO writers ext4: serialize truncate with owerwrite DIO workers ext4: endless truncate due to nonlocked dio readers ext4: serialize unlocked dio reads with truncate ext4: serialize dio nonlocked reads with defrag workers ext4: completed_io locking cleanup ext4: fix unwritten counter leakage ext4: give i_aiodio_unwritten a more appropriate name ext4: ext4_inode_info diet ext4: convert to use leXX_add_cpu() ext4: ext4_bread usage audit fs: reserve fallocate flag codepoint ext4: remove redundant offset check in mext_check_arguments() ext4: don't clear orphan list on ro mount with errors jbd2: fix assertion failure in commit code due to lacking transaction credits ext4: release donor reference when EXT4_IOC_MOVE_EXT ioctl fails ext4: enable FITRIM ioctl on bigalloc file system ...
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/events/ext4.h242
1 files changed, 121 insertions, 121 deletions
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 69d8a69ea831..d49b285385e8 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -26,19 +26,19 @@ TRACE_EVENT(ext4_free_inode,
26 TP_STRUCT__entry( 26 TP_STRUCT__entry(
27 __field( dev_t, dev ) 27 __field( dev_t, dev )
28 __field( ino_t, ino ) 28 __field( ino_t, ino )
29 __field( __u16, mode )
30 __field( uid_t, uid ) 29 __field( uid_t, uid )
31 __field( gid_t, gid ) 30 __field( gid_t, gid )
32 __field( __u64, blocks ) 31 __field( __u64, blocks )
32 __field( __u16, mode )
33 ), 33 ),
34 34
35 TP_fast_assign( 35 TP_fast_assign(
36 __entry->dev = inode->i_sb->s_dev; 36 __entry->dev = inode->i_sb->s_dev;
37 __entry->ino = inode->i_ino; 37 __entry->ino = inode->i_ino;
38 __entry->mode = inode->i_mode;
39 __entry->uid = i_uid_read(inode); 38 __entry->uid = i_uid_read(inode);
40 __entry->gid = i_gid_read(inode); 39 __entry->gid = i_gid_read(inode);
41 __entry->blocks = inode->i_blocks; 40 __entry->blocks = inode->i_blocks;
41 __entry->mode = inode->i_mode;
42 ), 42 ),
43 43
44 TP_printk("dev %d,%d ino %lu mode 0%o uid %u gid %u blocks %llu", 44 TP_printk("dev %d,%d ino %lu mode 0%o uid %u gid %u blocks %llu",
@@ -300,10 +300,10 @@ TRACE_EVENT(ext4_da_writepages,
300 __field( long, pages_skipped ) 300 __field( long, pages_skipped )
301 __field( loff_t, range_start ) 301 __field( loff_t, range_start )
302 __field( loff_t, range_end ) 302 __field( loff_t, range_end )
303 __field( pgoff_t, writeback_index )
303 __field( int, sync_mode ) 304 __field( int, sync_mode )
304 __field( char, for_kupdate ) 305 __field( char, for_kupdate )
305 __field( char, range_cyclic ) 306 __field( char, range_cyclic )
306 __field( pgoff_t, writeback_index )
307 ), 307 ),
308 308
309 TP_fast_assign( 309 TP_fast_assign(
@@ -313,14 +313,14 @@ TRACE_EVENT(ext4_da_writepages,
313 __entry->pages_skipped = wbc->pages_skipped; 313 __entry->pages_skipped = wbc->pages_skipped;
314 __entry->range_start = wbc->range_start; 314 __entry->range_start = wbc->range_start;
315 __entry->range_end = wbc->range_end; 315 __entry->range_end = wbc->range_end;
316 __entry->writeback_index = inode->i_mapping->writeback_index;
316 __entry->sync_mode = wbc->sync_mode; 317 __entry->sync_mode = wbc->sync_mode;
317 __entry->for_kupdate = wbc->for_kupdate; 318 __entry->for_kupdate = wbc->for_kupdate;
318 __entry->range_cyclic = wbc->range_cyclic; 319 __entry->range_cyclic = wbc->range_cyclic;
319 __entry->writeback_index = inode->i_mapping->writeback_index;
320 ), 320 ),
321 321
322 TP_printk("dev %d,%d ino %lu nr_to_write %ld pages_skipped %ld " 322 TP_printk("dev %d,%d ino %lu nr_to_write %ld pages_skipped %ld "
323 "range_start %lld range_end %lld sync_mode %d" 323 "range_start %lld range_end %lld sync_mode %d "
324 "for_kupdate %d range_cyclic %d writeback_index %lu", 324 "for_kupdate %d range_cyclic %d writeback_index %lu",
325 MAJOR(__entry->dev), MINOR(__entry->dev), 325 MAJOR(__entry->dev), MINOR(__entry->dev),
326 (unsigned long) __entry->ino, __entry->nr_to_write, 326 (unsigned long) __entry->ino, __entry->nr_to_write,
@@ -382,8 +382,8 @@ TRACE_EVENT(ext4_da_writepages_result,
382 __field( int, ret ) 382 __field( int, ret )
383 __field( int, pages_written ) 383 __field( int, pages_written )
384 __field( long, pages_skipped ) 384 __field( long, pages_skipped )
385 __field( int, sync_mode )
386 __field( pgoff_t, writeback_index ) 385 __field( pgoff_t, writeback_index )
386 __field( int, sync_mode )
387 ), 387 ),
388 388
389 TP_fast_assign( 389 TP_fast_assign(
@@ -392,8 +392,8 @@ TRACE_EVENT(ext4_da_writepages_result,
392 __entry->ret = ret; 392 __entry->ret = ret;
393 __entry->pages_written = pages_written; 393 __entry->pages_written = pages_written;
394 __entry->pages_skipped = wbc->pages_skipped; 394 __entry->pages_skipped = wbc->pages_skipped;
395 __entry->sync_mode = wbc->sync_mode;
396 __entry->writeback_index = inode->i_mapping->writeback_index; 395 __entry->writeback_index = inode->i_mapping->writeback_index;
396 __entry->sync_mode = wbc->sync_mode;
397 ), 397 ),
398 398
399 TP_printk("dev %d,%d ino %lu ret %d pages_written %d pages_skipped %ld " 399 TP_printk("dev %d,%d ino %lu ret %d pages_written %d pages_skipped %ld "
@@ -411,16 +411,16 @@ DECLARE_EVENT_CLASS(ext4__page_op,
411 TP_ARGS(page), 411 TP_ARGS(page),
412 412
413 TP_STRUCT__entry( 413 TP_STRUCT__entry(
414 __field( pgoff_t, index )
415 __field( ino_t, ino )
416 __field( dev_t, dev ) 414 __field( dev_t, dev )
415 __field( ino_t, ino )
416 __field( pgoff_t, index )
417 417
418 ), 418 ),
419 419
420 TP_fast_assign( 420 TP_fast_assign(
421 __entry->index = page->index;
422 __entry->ino = page->mapping->host->i_ino;
423 __entry->dev = page->mapping->host->i_sb->s_dev; 421 __entry->dev = page->mapping->host->i_sb->s_dev;
422 __entry->ino = page->mapping->host->i_ino;
423 __entry->index = page->index;
424 ), 424 ),
425 425
426 TP_printk("dev %d,%d ino %lu page_index %lu", 426 TP_printk("dev %d,%d ino %lu page_index %lu",
@@ -456,18 +456,18 @@ TRACE_EVENT(ext4_invalidatepage,
456 TP_ARGS(page, offset), 456 TP_ARGS(page, offset),
457 457
458 TP_STRUCT__entry( 458 TP_STRUCT__entry(
459 __field( dev_t, dev )
460 __field( ino_t, ino )
459 __field( pgoff_t, index ) 461 __field( pgoff_t, index )
460 __field( unsigned long, offset ) 462 __field( unsigned long, offset )
461 __field( ino_t, ino )
462 __field( dev_t, dev )
463 463
464 ), 464 ),
465 465
466 TP_fast_assign( 466 TP_fast_assign(
467 __entry->dev = page->mapping->host->i_sb->s_dev;
468 __entry->ino = page->mapping->host->i_ino;
467 __entry->index = page->index; 469 __entry->index = page->index;
468 __entry->offset = offset; 470 __entry->offset = offset;
469 __entry->ino = page->mapping->host->i_ino;
470 __entry->dev = page->mapping->host->i_sb->s_dev;
471 ), 471 ),
472 472
473 TP_printk("dev %d,%d ino %lu page_index %lu offset %lu", 473 TP_printk("dev %d,%d ino %lu page_index %lu offset %lu",
@@ -510,8 +510,8 @@ DECLARE_EVENT_CLASS(ext4__mb_new_pa,
510 __field( dev_t, dev ) 510 __field( dev_t, dev )
511 __field( ino_t, ino ) 511 __field( ino_t, ino )
512 __field( __u64, pa_pstart ) 512 __field( __u64, pa_pstart )
513 __field( __u32, pa_len )
514 __field( __u64, pa_lstart ) 513 __field( __u64, pa_lstart )
514 __field( __u32, pa_len )
515 515
516 ), 516 ),
517 517
@@ -519,8 +519,8 @@ DECLARE_EVENT_CLASS(ext4__mb_new_pa,
519 __entry->dev = ac->ac_sb->s_dev; 519 __entry->dev = ac->ac_sb->s_dev;
520 __entry->ino = ac->ac_inode->i_ino; 520 __entry->ino = ac->ac_inode->i_ino;
521 __entry->pa_pstart = pa->pa_pstart; 521 __entry->pa_pstart = pa->pa_pstart;
522 __entry->pa_len = pa->pa_len;
523 __entry->pa_lstart = pa->pa_lstart; 522 __entry->pa_lstart = pa->pa_lstart;
523 __entry->pa_len = pa->pa_len;
524 ), 524 ),
525 525
526 TP_printk("dev %d,%d ino %lu pstart %llu len %u lstart %llu", 526 TP_printk("dev %d,%d ino %lu pstart %llu len %u lstart %llu",
@@ -645,7 +645,6 @@ TRACE_EVENT(ext4_request_blocks,
645 TP_STRUCT__entry( 645 TP_STRUCT__entry(
646 __field( dev_t, dev ) 646 __field( dev_t, dev )
647 __field( ino_t, ino ) 647 __field( ino_t, ino )
648 __field( unsigned int, flags )
649 __field( unsigned int, len ) 648 __field( unsigned int, len )
650 __field( __u32, logical ) 649 __field( __u32, logical )
651 __field( __u32, lleft ) 650 __field( __u32, lleft )
@@ -653,12 +652,12 @@ TRACE_EVENT(ext4_request_blocks,
653 __field( __u64, goal ) 652 __field( __u64, goal )
654 __field( __u64, pleft ) 653 __field( __u64, pleft )
655 __field( __u64, pright ) 654 __field( __u64, pright )
655 __field( unsigned int, flags )
656 ), 656 ),
657 657
658 TP_fast_assign( 658 TP_fast_assign(
659 __entry->dev = ar->inode->i_sb->s_dev; 659 __entry->dev = ar->inode->i_sb->s_dev;
660 __entry->ino = ar->inode->i_ino; 660 __entry->ino = ar->inode->i_ino;
661 __entry->flags = ar->flags;
662 __entry->len = ar->len; 661 __entry->len = ar->len;
663 __entry->logical = ar->logical; 662 __entry->logical = ar->logical;
664 __entry->goal = ar->goal; 663 __entry->goal = ar->goal;
@@ -666,6 +665,7 @@ TRACE_EVENT(ext4_request_blocks,
666 __entry->lright = ar->lright; 665 __entry->lright = ar->lright;
667 __entry->pleft = ar->pleft; 666 __entry->pleft = ar->pleft;
668 __entry->pright = ar->pright; 667 __entry->pright = ar->pright;
668 __entry->flags = ar->flags;
669 ), 669 ),
670 670
671 TP_printk("dev %d,%d ino %lu flags %u len %u lblk %u goal %llu " 671 TP_printk("dev %d,%d ino %lu flags %u len %u lblk %u goal %llu "
@@ -686,7 +686,6 @@ TRACE_EVENT(ext4_allocate_blocks,
686 __field( dev_t, dev ) 686 __field( dev_t, dev )
687 __field( ino_t, ino ) 687 __field( ino_t, ino )
688 __field( __u64, block ) 688 __field( __u64, block )
689 __field( unsigned int, flags )
690 __field( unsigned int, len ) 689 __field( unsigned int, len )
691 __field( __u32, logical ) 690 __field( __u32, logical )
692 __field( __u32, lleft ) 691 __field( __u32, lleft )
@@ -694,13 +693,13 @@ TRACE_EVENT(ext4_allocate_blocks,
694 __field( __u64, goal ) 693 __field( __u64, goal )
695 __field( __u64, pleft ) 694 __field( __u64, pleft )
696 __field( __u64, pright ) 695 __field( __u64, pright )
696 __field( unsigned int, flags )
697 ), 697 ),
698 698
699 TP_fast_assign( 699 TP_fast_assign(
700 __entry->dev = ar->inode->i_sb->s_dev; 700 __entry->dev = ar->inode->i_sb->s_dev;
701 __entry->ino = ar->inode->i_ino; 701 __entry->ino = ar->inode->i_ino;
702 __entry->block = block; 702 __entry->block = block;
703 __entry->flags = ar->flags;
704 __entry->len = ar->len; 703 __entry->len = ar->len;
705 __entry->logical = ar->logical; 704 __entry->logical = ar->logical;
706 __entry->goal = ar->goal; 705 __entry->goal = ar->goal;
@@ -708,6 +707,7 @@ TRACE_EVENT(ext4_allocate_blocks,
708 __entry->lright = ar->lright; 707 __entry->lright = ar->lright;
709 __entry->pleft = ar->pleft; 708 __entry->pleft = ar->pleft;
710 __entry->pright = ar->pright; 709 __entry->pright = ar->pright;
710 __entry->flags = ar->flags;
711 ), 711 ),
712 712
713 TP_printk("dev %d,%d ino %lu flags %u len %u block %llu lblk %u " 713 TP_printk("dev %d,%d ino %lu flags %u len %u block %llu lblk %u "
@@ -728,19 +728,19 @@ TRACE_EVENT(ext4_free_blocks,
728 TP_STRUCT__entry( 728 TP_STRUCT__entry(
729 __field( dev_t, dev ) 729 __field( dev_t, dev )
730 __field( ino_t, ino ) 730 __field( ino_t, ino )
731 __field( __u16, mode )
732 __field( __u64, block ) 731 __field( __u64, block )
733 __field( unsigned long, count ) 732 __field( unsigned long, count )
734 __field( int, flags ) 733 __field( int, flags )
734 __field( __u16, mode )
735 ), 735 ),
736 736
737 TP_fast_assign( 737 TP_fast_assign(
738 __entry->dev = inode->i_sb->s_dev; 738 __entry->dev = inode->i_sb->s_dev;
739 __entry->ino = inode->i_ino; 739 __entry->ino = inode->i_ino;
740 __entry->mode = inode->i_mode;
741 __entry->block = block; 740 __entry->block = block;
742 __entry->count = count; 741 __entry->count = count;
743 __entry->flags = flags; 742 __entry->flags = flags;
743 __entry->mode = inode->i_mode;
744 ), 744 ),
745 745
746 TP_printk("dev %d,%d ino %lu mode 0%o block %llu count %lu flags %d", 746 TP_printk("dev %d,%d ino %lu mode 0%o block %llu count %lu flags %d",
@@ -783,15 +783,15 @@ TRACE_EVENT(ext4_sync_file_exit,
783 TP_ARGS(inode, ret), 783 TP_ARGS(inode, ret),
784 784
785 TP_STRUCT__entry( 785 TP_STRUCT__entry(
786 __field( int, ret )
787 __field( ino_t, ino )
788 __field( dev_t, dev ) 786 __field( dev_t, dev )
787 __field( ino_t, ino )
788 __field( int, ret )
789 ), 789 ),
790 790
791 TP_fast_assign( 791 TP_fast_assign(
792 __entry->ret = ret;
793 __entry->ino = inode->i_ino;
794 __entry->dev = inode->i_sb->s_dev; 792 __entry->dev = inode->i_sb->s_dev;
793 __entry->ino = inode->i_ino;
794 __entry->ret = ret;
795 ), 795 ),
796 796
797 TP_printk("dev %d,%d ino %lu ret %d", 797 TP_printk("dev %d,%d ino %lu ret %d",
@@ -854,12 +854,6 @@ TRACE_EVENT(ext4_mballoc_alloc,
854 TP_STRUCT__entry( 854 TP_STRUCT__entry(
855 __field( dev_t, dev ) 855 __field( dev_t, dev )
856 __field( ino_t, ino ) 856 __field( ino_t, ino )
857 __field( __u16, found )
858 __field( __u16, groups )
859 __field( __u16, buddy )
860 __field( __u16, flags )
861 __field( __u16, tail )
862 __field( __u8, cr )
863 __field( __u32, orig_logical ) 857 __field( __u32, orig_logical )
864 __field( int, orig_start ) 858 __field( int, orig_start )
865 __field( __u32, orig_group ) 859 __field( __u32, orig_group )
@@ -872,17 +866,17 @@ TRACE_EVENT(ext4_mballoc_alloc,
872 __field( int, result_start ) 866 __field( int, result_start )
873 __field( __u32, result_group ) 867 __field( __u32, result_group )
874 __field( int, result_len ) 868 __field( int, result_len )
869 __field( __u16, found )
870 __field( __u16, groups )
871 __field( __u16, buddy )
872 __field( __u16, flags )
873 __field( __u16, tail )
874 __field( __u8, cr )
875 ), 875 ),
876 876
877 TP_fast_assign( 877 TP_fast_assign(
878 __entry->dev = ac->ac_inode->i_sb->s_dev; 878 __entry->dev = ac->ac_inode->i_sb->s_dev;
879 __entry->ino = ac->ac_inode->i_ino; 879 __entry->ino = ac->ac_inode->i_ino;
880 __entry->found = ac->ac_found;
881 __entry->flags = ac->ac_flags;
882 __entry->groups = ac->ac_groups_scanned;
883 __entry->buddy = ac->ac_buddy;
884 __entry->tail = ac->ac_tail;
885 __entry->cr = ac->ac_criteria;
886 __entry->orig_logical = ac->ac_o_ex.fe_logical; 880 __entry->orig_logical = ac->ac_o_ex.fe_logical;
887 __entry->orig_start = ac->ac_o_ex.fe_start; 881 __entry->orig_start = ac->ac_o_ex.fe_start;
888 __entry->orig_group = ac->ac_o_ex.fe_group; 882 __entry->orig_group = ac->ac_o_ex.fe_group;
@@ -895,6 +889,12 @@ TRACE_EVENT(ext4_mballoc_alloc,
895 __entry->result_start = ac->ac_f_ex.fe_start; 889 __entry->result_start = ac->ac_f_ex.fe_start;
896 __entry->result_group = ac->ac_f_ex.fe_group; 890 __entry->result_group = ac->ac_f_ex.fe_group;
897 __entry->result_len = ac->ac_f_ex.fe_len; 891 __entry->result_len = ac->ac_f_ex.fe_len;
892 __entry->found = ac->ac_found;
893 __entry->flags = ac->ac_flags;
894 __entry->groups = ac->ac_groups_scanned;
895 __entry->buddy = ac->ac_buddy;
896 __entry->tail = ac->ac_tail;
897 __entry->cr = ac->ac_criteria;
898 ), 898 ),
899 899
900 TP_printk("dev %d,%d inode %lu orig %u/%d/%u@%u goal %u/%d/%u@%u " 900 TP_printk("dev %d,%d inode %lu orig %u/%d/%u@%u goal %u/%d/%u@%u "
@@ -1015,17 +1015,17 @@ TRACE_EVENT(ext4_forget,
1015 TP_STRUCT__entry( 1015 TP_STRUCT__entry(
1016 __field( dev_t, dev ) 1016 __field( dev_t, dev )
1017 __field( ino_t, ino ) 1017 __field( ino_t, ino )
1018 __field( __u16, mode )
1019 __field( int, is_metadata )
1020 __field( __u64, block ) 1018 __field( __u64, block )
1019 __field( int, is_metadata )
1020 __field( __u16, mode )
1021 ), 1021 ),
1022 1022
1023 TP_fast_assign( 1023 TP_fast_assign(
1024 __entry->dev = inode->i_sb->s_dev; 1024 __entry->dev = inode->i_sb->s_dev;
1025 __entry->ino = inode->i_ino; 1025 __entry->ino = inode->i_ino;
1026 __entry->mode = inode->i_mode;
1027 __entry->is_metadata = is_metadata;
1028 __entry->block = block; 1026 __entry->block = block;
1027 __entry->is_metadata = is_metadata;
1028 __entry->mode = inode->i_mode;
1029 ), 1029 ),
1030 1030
1031 TP_printk("dev %d,%d ino %lu mode 0%o is_metadata %d block %llu", 1031 TP_printk("dev %d,%d ino %lu mode 0%o is_metadata %d block %llu",
@@ -1042,19 +1042,18 @@ TRACE_EVENT(ext4_da_update_reserve_space,
1042 TP_STRUCT__entry( 1042 TP_STRUCT__entry(
1043 __field( dev_t, dev ) 1043 __field( dev_t, dev )
1044 __field( ino_t, ino ) 1044 __field( ino_t, ino )
1045 __field( __u16, mode )
1046 __field( __u64, i_blocks ) 1045 __field( __u64, i_blocks )
1047 __field( int, used_blocks ) 1046 __field( int, used_blocks )
1048 __field( int, reserved_data_blocks ) 1047 __field( int, reserved_data_blocks )
1049 __field( int, reserved_meta_blocks ) 1048 __field( int, reserved_meta_blocks )
1050 __field( int, allocated_meta_blocks ) 1049 __field( int, allocated_meta_blocks )
1051 __field( int, quota_claim ) 1050 __field( int, quota_claim )
1051 __field( __u16, mode )
1052 ), 1052 ),
1053 1053
1054 TP_fast_assign( 1054 TP_fast_assign(
1055 __entry->dev = inode->i_sb->s_dev; 1055 __entry->dev = inode->i_sb->s_dev;
1056 __entry->ino = inode->i_ino; 1056 __entry->ino = inode->i_ino;
1057 __entry->mode = inode->i_mode;
1058 __entry->i_blocks = inode->i_blocks; 1057 __entry->i_blocks = inode->i_blocks;
1059 __entry->used_blocks = used_blocks; 1058 __entry->used_blocks = used_blocks;
1060 __entry->reserved_data_blocks = 1059 __entry->reserved_data_blocks =
@@ -1064,6 +1063,7 @@ TRACE_EVENT(ext4_da_update_reserve_space,
1064 __entry->allocated_meta_blocks = 1063 __entry->allocated_meta_blocks =
1065 EXT4_I(inode)->i_allocated_meta_blocks; 1064 EXT4_I(inode)->i_allocated_meta_blocks;
1066 __entry->quota_claim = quota_claim; 1065 __entry->quota_claim = quota_claim;
1066 __entry->mode = inode->i_mode;
1067 ), 1067 ),
1068 1068
1069 TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu used_blocks %d " 1069 TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu used_blocks %d "
@@ -1085,21 +1085,21 @@ TRACE_EVENT(ext4_da_reserve_space,
1085 TP_STRUCT__entry( 1085 TP_STRUCT__entry(
1086 __field( dev_t, dev ) 1086 __field( dev_t, dev )
1087 __field( ino_t, ino ) 1087 __field( ino_t, ino )
1088 __field( __u16, mode )
1089 __field( __u64, i_blocks ) 1088 __field( __u64, i_blocks )
1090 __field( int, md_needed ) 1089 __field( int, md_needed )
1091 __field( int, reserved_data_blocks ) 1090 __field( int, reserved_data_blocks )
1092 __field( int, reserved_meta_blocks ) 1091 __field( int, reserved_meta_blocks )
1092 __field( __u16, mode )
1093 ), 1093 ),
1094 1094
1095 TP_fast_assign( 1095 TP_fast_assign(
1096 __entry->dev = inode->i_sb->s_dev; 1096 __entry->dev = inode->i_sb->s_dev;
1097 __entry->ino = inode->i_ino; 1097 __entry->ino = inode->i_ino;
1098 __entry->mode = inode->i_mode;
1099 __entry->i_blocks = inode->i_blocks; 1098 __entry->i_blocks = inode->i_blocks;
1100 __entry->md_needed = md_needed; 1099 __entry->md_needed = md_needed;
1101 __entry->reserved_data_blocks = EXT4_I(inode)->i_reserved_data_blocks; 1100 __entry->reserved_data_blocks = EXT4_I(inode)->i_reserved_data_blocks;
1102 __entry->reserved_meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks; 1101 __entry->reserved_meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks;
1102 __entry->mode = inode->i_mode;
1103 ), 1103 ),
1104 1104
1105 TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu md_needed %d " 1105 TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu md_needed %d "
@@ -1119,23 +1119,23 @@ TRACE_EVENT(ext4_da_release_space,
1119 TP_STRUCT__entry( 1119 TP_STRUCT__entry(
1120 __field( dev_t, dev ) 1120 __field( dev_t, dev )
1121 __field( ino_t, ino ) 1121 __field( ino_t, ino )
1122 __field( __u16, mode )
1123 __field( __u64, i_blocks ) 1122 __field( __u64, i_blocks )
1124 __field( int, freed_blocks ) 1123 __field( int, freed_blocks )
1125 __field( int, reserved_data_blocks ) 1124 __field( int, reserved_data_blocks )
1126 __field( int, reserved_meta_blocks ) 1125 __field( int, reserved_meta_blocks )
1127 __field( int, allocated_meta_blocks ) 1126 __field( int, allocated_meta_blocks )
1127 __field( __u16, mode )
1128 ), 1128 ),
1129 1129
1130 TP_fast_assign( 1130 TP_fast_assign(
1131 __entry->dev = inode->i_sb->s_dev; 1131 __entry->dev = inode->i_sb->s_dev;
1132 __entry->ino = inode->i_ino; 1132 __entry->ino = inode->i_ino;
1133 __entry->mode = inode->i_mode;
1134 __entry->i_blocks = inode->i_blocks; 1133 __entry->i_blocks = inode->i_blocks;
1135 __entry->freed_blocks = freed_blocks; 1134 __entry->freed_blocks = freed_blocks;
1136 __entry->reserved_data_blocks = EXT4_I(inode)->i_reserved_data_blocks; 1135 __entry->reserved_data_blocks = EXT4_I(inode)->i_reserved_data_blocks;
1137 __entry->reserved_meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks; 1136 __entry->reserved_meta_blocks = EXT4_I(inode)->i_reserved_meta_blocks;
1138 __entry->allocated_meta_blocks = EXT4_I(inode)->i_allocated_meta_blocks; 1137 __entry->allocated_meta_blocks = EXT4_I(inode)->i_allocated_meta_blocks;
1138 __entry->mode = inode->i_mode;
1139 ), 1139 ),
1140 1140
1141 TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu freed_blocks %d " 1141 TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu freed_blocks %d "
@@ -1203,16 +1203,16 @@ TRACE_EVENT(ext4_direct_IO_enter,
1203 TP_ARGS(inode, offset, len, rw), 1203 TP_ARGS(inode, offset, len, rw),
1204 1204
1205 TP_STRUCT__entry( 1205 TP_STRUCT__entry(
1206 __field( ino_t, ino )
1207 __field( dev_t, dev ) 1206 __field( dev_t, dev )
1207 __field( ino_t, ino )
1208 __field( loff_t, pos ) 1208 __field( loff_t, pos )
1209 __field( unsigned long, len ) 1209 __field( unsigned long, len )
1210 __field( int, rw ) 1210 __field( int, rw )
1211 ), 1211 ),
1212 1212
1213 TP_fast_assign( 1213 TP_fast_assign(
1214 __entry->ino = inode->i_ino;
1215 __entry->dev = inode->i_sb->s_dev; 1214 __entry->dev = inode->i_sb->s_dev;
1215 __entry->ino = inode->i_ino;
1216 __entry->pos = offset; 1216 __entry->pos = offset;
1217 __entry->len = len; 1217 __entry->len = len;
1218 __entry->rw = rw; 1218 __entry->rw = rw;
@@ -1231,8 +1231,8 @@ TRACE_EVENT(ext4_direct_IO_exit,
1231 TP_ARGS(inode, offset, len, rw, ret), 1231 TP_ARGS(inode, offset, len, rw, ret),
1232 1232
1233 TP_STRUCT__entry( 1233 TP_STRUCT__entry(
1234 __field( ino_t, ino )
1235 __field( dev_t, dev ) 1234 __field( dev_t, dev )
1235 __field( ino_t, ino )
1236 __field( loff_t, pos ) 1236 __field( loff_t, pos )
1237 __field( unsigned long, len ) 1237 __field( unsigned long, len )
1238 __field( int, rw ) 1238 __field( int, rw )
@@ -1240,8 +1240,8 @@ TRACE_EVENT(ext4_direct_IO_exit,
1240 ), 1240 ),
1241 1241
1242 TP_fast_assign( 1242 TP_fast_assign(
1243 __entry->ino = inode->i_ino;
1244 __entry->dev = inode->i_sb->s_dev; 1243 __entry->dev = inode->i_sb->s_dev;
1244 __entry->ino = inode->i_ino;
1245 __entry->pos = offset; 1245 __entry->pos = offset;
1246 __entry->len = len; 1246 __entry->len = len;
1247 __entry->rw = rw; 1247 __entry->rw = rw;
@@ -1261,16 +1261,16 @@ TRACE_EVENT(ext4_fallocate_enter,
1261 TP_ARGS(inode, offset, len, mode), 1261 TP_ARGS(inode, offset, len, mode),
1262 1262
1263 TP_STRUCT__entry( 1263 TP_STRUCT__entry(
1264 __field( ino_t, ino )
1265 __field( dev_t, dev ) 1264 __field( dev_t, dev )
1265 __field( ino_t, ino )
1266 __field( loff_t, pos ) 1266 __field( loff_t, pos )
1267 __field( loff_t, len ) 1267 __field( loff_t, len )
1268 __field( int, mode ) 1268 __field( int, mode )
1269 ), 1269 ),
1270 1270
1271 TP_fast_assign( 1271 TP_fast_assign(
1272 __entry->ino = inode->i_ino;
1273 __entry->dev = inode->i_sb->s_dev; 1272 __entry->dev = inode->i_sb->s_dev;
1273 __entry->ino = inode->i_ino;
1274 __entry->pos = offset; 1274 __entry->pos = offset;
1275 __entry->len = len; 1275 __entry->len = len;
1276 __entry->mode = mode; 1276 __entry->mode = mode;
@@ -1289,16 +1289,16 @@ TRACE_EVENT(ext4_fallocate_exit,
1289 TP_ARGS(inode, offset, max_blocks, ret), 1289 TP_ARGS(inode, offset, max_blocks, ret),
1290 1290
1291 TP_STRUCT__entry( 1291 TP_STRUCT__entry(
1292 __field( ino_t, ino )
1293 __field( dev_t, dev ) 1292 __field( dev_t, dev )
1293 __field( ino_t, ino )
1294 __field( loff_t, pos ) 1294 __field( loff_t, pos )
1295 __field( unsigned int, blocks ) 1295 __field( unsigned int, blocks )
1296 __field( int, ret ) 1296 __field( int, ret )
1297 ), 1297 ),
1298 1298
1299 TP_fast_assign( 1299 TP_fast_assign(
1300 __entry->ino = inode->i_ino;
1301 __entry->dev = inode->i_sb->s_dev; 1300 __entry->dev = inode->i_sb->s_dev;
1301 __entry->ino = inode->i_ino;
1302 __entry->pos = offset; 1302 __entry->pos = offset;
1303 __entry->blocks = max_blocks; 1303 __entry->blocks = max_blocks;
1304 __entry->ret = ret; 1304 __entry->ret = ret;
@@ -1317,17 +1317,17 @@ TRACE_EVENT(ext4_unlink_enter,
1317 TP_ARGS(parent, dentry), 1317 TP_ARGS(parent, dentry),
1318 1318
1319 TP_STRUCT__entry( 1319 TP_STRUCT__entry(
1320 __field( ino_t, parent ) 1320 __field( dev_t, dev )
1321 __field( ino_t, ino ) 1321 __field( ino_t, ino )
1322 __field( ino_t, parent )
1322 __field( loff_t, size ) 1323 __field( loff_t, size )
1323 __field( dev_t, dev )
1324 ), 1324 ),
1325 1325
1326 TP_fast_assign( 1326 TP_fast_assign(
1327 __entry->parent = parent->i_ino; 1327 __entry->dev = dentry->d_inode->i_sb->s_dev;
1328 __entry->ino = dentry->d_inode->i_ino; 1328 __entry->ino = dentry->d_inode->i_ino;
1329 __entry->parent = parent->i_ino;
1329 __entry->size = dentry->d_inode->i_size; 1330 __entry->size = dentry->d_inode->i_size;
1330 __entry->dev = dentry->d_inode->i_sb->s_dev;
1331 ), 1331 ),
1332 1332
1333 TP_printk("dev %d,%d ino %lu size %lld parent %lu", 1333 TP_printk("dev %d,%d ino %lu size %lld parent %lu",
@@ -1342,14 +1342,14 @@ TRACE_EVENT(ext4_unlink_exit,
1342 TP_ARGS(dentry, ret), 1342 TP_ARGS(dentry, ret),
1343 1343
1344 TP_STRUCT__entry( 1344 TP_STRUCT__entry(
1345 __field( ino_t, ino )
1346 __field( dev_t, dev ) 1345 __field( dev_t, dev )
1346 __field( ino_t, ino )
1347 __field( int, ret ) 1347 __field( int, ret )
1348 ), 1348 ),
1349 1349
1350 TP_fast_assign( 1350 TP_fast_assign(
1351 __entry->ino = dentry->d_inode->i_ino;
1352 __entry->dev = dentry->d_inode->i_sb->s_dev; 1351 __entry->dev = dentry->d_inode->i_sb->s_dev;
1352 __entry->ino = dentry->d_inode->i_ino;
1353 __entry->ret = ret; 1353 __entry->ret = ret;
1354 ), 1354 ),
1355 1355
@@ -1365,14 +1365,14 @@ DECLARE_EVENT_CLASS(ext4__truncate,
1365 TP_ARGS(inode), 1365 TP_ARGS(inode),
1366 1366
1367 TP_STRUCT__entry( 1367 TP_STRUCT__entry(
1368 __field( ino_t, ino ) 1368 __field( dev_t, dev )
1369 __field( dev_t, dev ) 1369 __field( ino_t, ino )
1370 __field( __u64, blocks ) 1370 __field( __u64, blocks )
1371 ), 1371 ),
1372 1372
1373 TP_fast_assign( 1373 TP_fast_assign(
1374 __entry->ino = inode->i_ino;
1375 __entry->dev = inode->i_sb->s_dev; 1374 __entry->dev = inode->i_sb->s_dev;
1375 __entry->ino = inode->i_ino;
1376 __entry->blocks = inode->i_blocks; 1376 __entry->blocks = inode->i_blocks;
1377 ), 1377 ),
1378 1378
@@ -1403,8 +1403,8 @@ TRACE_EVENT(ext4_ext_convert_to_initialized_enter,
1403 TP_ARGS(inode, map, ux), 1403 TP_ARGS(inode, map, ux),
1404 1404
1405 TP_STRUCT__entry( 1405 TP_STRUCT__entry(
1406 __field( ino_t, ino )
1407 __field( dev_t, dev ) 1406 __field( dev_t, dev )
1407 __field( ino_t, ino )
1408 __field( ext4_lblk_t, m_lblk ) 1408 __field( ext4_lblk_t, m_lblk )
1409 __field( unsigned, m_len ) 1409 __field( unsigned, m_len )
1410 __field( ext4_lblk_t, u_lblk ) 1410 __field( ext4_lblk_t, u_lblk )
@@ -1413,8 +1413,8 @@ TRACE_EVENT(ext4_ext_convert_to_initialized_enter,
1413 ), 1413 ),
1414 1414
1415 TP_fast_assign( 1415 TP_fast_assign(
1416 __entry->ino = inode->i_ino;
1417 __entry->dev = inode->i_sb->s_dev; 1416 __entry->dev = inode->i_sb->s_dev;
1417 __entry->ino = inode->i_ino;
1418 __entry->m_lblk = map->m_lblk; 1418 __entry->m_lblk = map->m_lblk;
1419 __entry->m_len = map->m_len; 1419 __entry->m_len = map->m_len;
1420 __entry->u_lblk = le32_to_cpu(ux->ee_block); 1420 __entry->u_lblk = le32_to_cpu(ux->ee_block);
@@ -1441,8 +1441,8 @@ TRACE_EVENT(ext4_ext_convert_to_initialized_fastpath,
1441 TP_ARGS(inode, map, ux, ix), 1441 TP_ARGS(inode, map, ux, ix),
1442 1442
1443 TP_STRUCT__entry( 1443 TP_STRUCT__entry(
1444 __field( ino_t, ino )
1445 __field( dev_t, dev ) 1444 __field( dev_t, dev )
1445 __field( ino_t, ino )
1446 __field( ext4_lblk_t, m_lblk ) 1446 __field( ext4_lblk_t, m_lblk )
1447 __field( unsigned, m_len ) 1447 __field( unsigned, m_len )
1448 __field( ext4_lblk_t, u_lblk ) 1448 __field( ext4_lblk_t, u_lblk )
@@ -1454,8 +1454,8 @@ TRACE_EVENT(ext4_ext_convert_to_initialized_fastpath,
1454 ), 1454 ),
1455 1455
1456 TP_fast_assign( 1456 TP_fast_assign(
1457 __entry->ino = inode->i_ino;
1458 __entry->dev = inode->i_sb->s_dev; 1457 __entry->dev = inode->i_sb->s_dev;
1458 __entry->ino = inode->i_ino;
1459 __entry->m_lblk = map->m_lblk; 1459 __entry->m_lblk = map->m_lblk;
1460 __entry->m_len = map->m_len; 1460 __entry->m_len = map->m_len;
1461 __entry->u_lblk = le32_to_cpu(ux->ee_block); 1461 __entry->u_lblk = le32_to_cpu(ux->ee_block);
@@ -1483,16 +1483,16 @@ DECLARE_EVENT_CLASS(ext4__map_blocks_enter,
1483 TP_ARGS(inode, lblk, len, flags), 1483 TP_ARGS(inode, lblk, len, flags),
1484 1484
1485 TP_STRUCT__entry( 1485 TP_STRUCT__entry(
1486 __field( ino_t, ino ) 1486 __field( dev_t, dev )
1487 __field( dev_t, dev ) 1487 __field( ino_t, ino )
1488 __field( ext4_lblk_t, lblk ) 1488 __field( ext4_lblk_t, lblk )
1489 __field( unsigned int, len ) 1489 __field( unsigned int, len )
1490 __field( unsigned int, flags ) 1490 __field( unsigned int, flags )
1491 ), 1491 ),
1492 1492
1493 TP_fast_assign( 1493 TP_fast_assign(
1494 __entry->ino = inode->i_ino;
1495 __entry->dev = inode->i_sb->s_dev; 1494 __entry->dev = inode->i_sb->s_dev;
1495 __entry->ino = inode->i_ino;
1496 __entry->lblk = lblk; 1496 __entry->lblk = lblk;
1497 __entry->len = len; 1497 __entry->len = len;
1498 __entry->flags = flags; 1498 __entry->flags = flags;
@@ -1525,19 +1525,19 @@ DECLARE_EVENT_CLASS(ext4__map_blocks_exit,
1525 TP_ARGS(inode, lblk, pblk, len, ret), 1525 TP_ARGS(inode, lblk, pblk, len, ret),
1526 1526
1527 TP_STRUCT__entry( 1527 TP_STRUCT__entry(
1528 __field( ino_t, ino )
1529 __field( dev_t, dev ) 1528 __field( dev_t, dev )
1530 __field( ext4_lblk_t, lblk ) 1529 __field( ino_t, ino )
1531 __field( ext4_fsblk_t, pblk ) 1530 __field( ext4_fsblk_t, pblk )
1531 __field( ext4_lblk_t, lblk )
1532 __field( unsigned int, len ) 1532 __field( unsigned int, len )
1533 __field( int, ret ) 1533 __field( int, ret )
1534 ), 1534 ),
1535 1535
1536 TP_fast_assign( 1536 TP_fast_assign(
1537 __entry->ino = inode->i_ino;
1538 __entry->dev = inode->i_sb->s_dev; 1537 __entry->dev = inode->i_sb->s_dev;
1539 __entry->lblk = lblk; 1538 __entry->ino = inode->i_ino;
1540 __entry->pblk = pblk; 1539 __entry->pblk = pblk;
1540 __entry->lblk = lblk;
1541 __entry->len = len; 1541 __entry->len = len;
1542 __entry->ret = ret; 1542 __entry->ret = ret;
1543 ), 1543 ),
@@ -1569,17 +1569,17 @@ TRACE_EVENT(ext4_ext_load_extent,
1569 TP_ARGS(inode, lblk, pblk), 1569 TP_ARGS(inode, lblk, pblk),
1570 1570
1571 TP_STRUCT__entry( 1571 TP_STRUCT__entry(
1572 __field( ino_t, ino )
1573 __field( dev_t, dev ) 1572 __field( dev_t, dev )
1574 __field( ext4_lblk_t, lblk ) 1573 __field( ino_t, ino )
1575 __field( ext4_fsblk_t, pblk ) 1574 __field( ext4_fsblk_t, pblk )
1575 __field( ext4_lblk_t, lblk )
1576 ), 1576 ),
1577 1577
1578 TP_fast_assign( 1578 TP_fast_assign(
1579 __entry->ino = inode->i_ino;
1580 __entry->dev = inode->i_sb->s_dev; 1579 __entry->dev = inode->i_sb->s_dev;
1581 __entry->lblk = lblk; 1580 __entry->ino = inode->i_ino;
1582 __entry->pblk = pblk; 1581 __entry->pblk = pblk;
1582 __entry->lblk = lblk;
1583 ), 1583 ),
1584 1584
1585 TP_printk("dev %d,%d ino %lu lblk %u pblk %llu", 1585 TP_printk("dev %d,%d ino %lu lblk %u pblk %llu",
@@ -1594,13 +1594,13 @@ TRACE_EVENT(ext4_load_inode,
1594 TP_ARGS(inode), 1594 TP_ARGS(inode),
1595 1595
1596 TP_STRUCT__entry( 1596 TP_STRUCT__entry(
1597 __field( ino_t, ino )
1598 __field( dev_t, dev ) 1597 __field( dev_t, dev )
1598 __field( ino_t, ino )
1599 ), 1599 ),
1600 1600
1601 TP_fast_assign( 1601 TP_fast_assign(
1602 __entry->ino = inode->i_ino;
1603 __entry->dev = inode->i_sb->s_dev; 1602 __entry->dev = inode->i_sb->s_dev;
1603 __entry->ino = inode->i_ino;
1604 ), 1604 ),
1605 1605
1606 TP_printk("dev %d,%d ino %ld", 1606 TP_printk("dev %d,%d ino %ld",
@@ -1615,14 +1615,14 @@ TRACE_EVENT(ext4_journal_start,
1615 1615
1616 TP_STRUCT__entry( 1616 TP_STRUCT__entry(
1617 __field( dev_t, dev ) 1617 __field( dev_t, dev )
1618 __field( int, nblocks )
1619 __field(unsigned long, ip ) 1618 __field(unsigned long, ip )
1619 __field( int, nblocks )
1620 ), 1620 ),
1621 1621
1622 TP_fast_assign( 1622 TP_fast_assign(
1623 __entry->dev = sb->s_dev; 1623 __entry->dev = sb->s_dev;
1624 __entry->nblocks = nblocks;
1625 __entry->ip = IP; 1624 __entry->ip = IP;
1625 __entry->nblocks = nblocks;
1626 ), 1626 ),
1627 1627
1628 TP_printk("dev %d,%d nblocks %d caller %pF", 1628 TP_printk("dev %d,%d nblocks %d caller %pF",
@@ -1686,23 +1686,23 @@ TRACE_EVENT(ext4_ext_handle_uninitialized_extents,
1686 TP_ARGS(inode, map, allocated, newblock), 1686 TP_ARGS(inode, map, allocated, newblock),
1687 1687
1688 TP_STRUCT__entry( 1688 TP_STRUCT__entry(
1689 __field( ino_t, ino )
1690 __field( dev_t, dev ) 1689 __field( dev_t, dev )
1690 __field( ino_t, ino )
1691 __field( int, flags )
1691 __field( ext4_lblk_t, lblk ) 1692 __field( ext4_lblk_t, lblk )
1692 __field( ext4_fsblk_t, pblk ) 1693 __field( ext4_fsblk_t, pblk )
1693 __field( unsigned int, len ) 1694 __field( unsigned int, len )
1694 __field( int, flags )
1695 __field( unsigned int, allocated ) 1695 __field( unsigned int, allocated )
1696 __field( ext4_fsblk_t, newblk ) 1696 __field( ext4_fsblk_t, newblk )
1697 ), 1697 ),
1698 1698
1699 TP_fast_assign( 1699 TP_fast_assign(
1700 __entry->ino = inode->i_ino;
1701 __entry->dev = inode->i_sb->s_dev; 1700 __entry->dev = inode->i_sb->s_dev;
1701 __entry->ino = inode->i_ino;
1702 __entry->flags = map->m_flags;
1702 __entry->lblk = map->m_lblk; 1703 __entry->lblk = map->m_lblk;
1703 __entry->pblk = map->m_pblk; 1704 __entry->pblk = map->m_pblk;
1704 __entry->len = map->m_len; 1705 __entry->len = map->m_len;
1705 __entry->flags = map->m_flags;
1706 __entry->allocated = allocated; 1706 __entry->allocated = allocated;
1707 __entry->newblk = newblock; 1707 __entry->newblk = newblock;
1708 ), 1708 ),
@@ -1724,19 +1724,19 @@ TRACE_EVENT(ext4_get_implied_cluster_alloc_exit,
1724 1724
1725 TP_STRUCT__entry( 1725 TP_STRUCT__entry(
1726 __field( dev_t, dev ) 1726 __field( dev_t, dev )
1727 __field( unsigned int, flags )
1727 __field( ext4_lblk_t, lblk ) 1728 __field( ext4_lblk_t, lblk )
1728 __field( ext4_fsblk_t, pblk ) 1729 __field( ext4_fsblk_t, pblk )
1729 __field( unsigned int, len ) 1730 __field( unsigned int, len )
1730 __field( unsigned int, flags )
1731 __field( int, ret ) 1731 __field( int, ret )
1732 ), 1732 ),
1733 1733
1734 TP_fast_assign( 1734 TP_fast_assign(
1735 __entry->dev = sb->s_dev; 1735 __entry->dev = sb->s_dev;
1736 __entry->flags = map->m_flags;
1736 __entry->lblk = map->m_lblk; 1737 __entry->lblk = map->m_lblk;
1737 __entry->pblk = map->m_pblk; 1738 __entry->pblk = map->m_pblk;
1738 __entry->len = map->m_len; 1739 __entry->len = map->m_len;
1739 __entry->flags = map->m_flags;
1740 __entry->ret = ret; 1740 __entry->ret = ret;
1741 ), 1741 ),
1742 1742
@@ -1753,16 +1753,16 @@ TRACE_EVENT(ext4_ext_put_in_cache,
1753 TP_ARGS(inode, lblk, len, start), 1753 TP_ARGS(inode, lblk, len, start),
1754 1754
1755 TP_STRUCT__entry( 1755 TP_STRUCT__entry(
1756 __field( ino_t, ino )
1757 __field( dev_t, dev ) 1756 __field( dev_t, dev )
1757 __field( ino_t, ino )
1758 __field( ext4_lblk_t, lblk ) 1758 __field( ext4_lblk_t, lblk )
1759 __field( unsigned int, len ) 1759 __field( unsigned int, len )
1760 __field( ext4_fsblk_t, start ) 1760 __field( ext4_fsblk_t, start )
1761 ), 1761 ),
1762 1762
1763 TP_fast_assign( 1763 TP_fast_assign(
1764 __entry->ino = inode->i_ino;
1765 __entry->dev = inode->i_sb->s_dev; 1764 __entry->dev = inode->i_sb->s_dev;
1765 __entry->ino = inode->i_ino;
1766 __entry->lblk = lblk; 1766 __entry->lblk = lblk;
1767 __entry->len = len; 1767 __entry->len = len;
1768 __entry->start = start; 1768 __entry->start = start;
@@ -1782,15 +1782,15 @@ TRACE_EVENT(ext4_ext_in_cache,
1782 TP_ARGS(inode, lblk, ret), 1782 TP_ARGS(inode, lblk, ret),
1783 1783
1784 TP_STRUCT__entry( 1784 TP_STRUCT__entry(
1785 __field( ino_t, ino )
1786 __field( dev_t, dev ) 1785 __field( dev_t, dev )
1786 __field( ino_t, ino )
1787 __field( ext4_lblk_t, lblk ) 1787 __field( ext4_lblk_t, lblk )
1788 __field( int, ret ) 1788 __field( int, ret )
1789 ), 1789 ),
1790 1790
1791 TP_fast_assign( 1791 TP_fast_assign(
1792 __entry->ino = inode->i_ino;
1793 __entry->dev = inode->i_sb->s_dev; 1792 __entry->dev = inode->i_sb->s_dev;
1793 __entry->ino = inode->i_ino;
1794 __entry->lblk = lblk; 1794 __entry->lblk = lblk;
1795 __entry->ret = ret; 1795 __entry->ret = ret;
1796 ), 1796 ),
@@ -1810,8 +1810,8 @@ TRACE_EVENT(ext4_find_delalloc_range,
1810 TP_ARGS(inode, from, to, reverse, found, found_blk), 1810 TP_ARGS(inode, from, to, reverse, found, found_blk),
1811 1811
1812 TP_STRUCT__entry( 1812 TP_STRUCT__entry(
1813 __field( ino_t, ino )
1814 __field( dev_t, dev ) 1813 __field( dev_t, dev )
1814 __field( ino_t, ino )
1815 __field( ext4_lblk_t, from ) 1815 __field( ext4_lblk_t, from )
1816 __field( ext4_lblk_t, to ) 1816 __field( ext4_lblk_t, to )
1817 __field( int, reverse ) 1817 __field( int, reverse )
@@ -1820,8 +1820,8 @@ TRACE_EVENT(ext4_find_delalloc_range,
1820 ), 1820 ),
1821 1821
1822 TP_fast_assign( 1822 TP_fast_assign(
1823 __entry->ino = inode->i_ino;
1824 __entry->dev = inode->i_sb->s_dev; 1823 __entry->dev = inode->i_sb->s_dev;
1824 __entry->ino = inode->i_ino;
1825 __entry->from = from; 1825 __entry->from = from;
1826 __entry->to = to; 1826 __entry->to = to;
1827 __entry->reverse = reverse; 1827 __entry->reverse = reverse;
@@ -1844,15 +1844,15 @@ TRACE_EVENT(ext4_get_reserved_cluster_alloc,
1844 TP_ARGS(inode, lblk, len), 1844 TP_ARGS(inode, lblk, len),
1845 1845
1846 TP_STRUCT__entry( 1846 TP_STRUCT__entry(
1847 __field( ino_t, ino )
1848 __field( dev_t, dev ) 1847 __field( dev_t, dev )
1848 __field( ino_t, ino )
1849 __field( ext4_lblk_t, lblk ) 1849 __field( ext4_lblk_t, lblk )
1850 __field( unsigned int, len ) 1850 __field( unsigned int, len )
1851 ), 1851 ),
1852 1852
1853 TP_fast_assign( 1853 TP_fast_assign(
1854 __entry->ino = inode->i_ino;
1855 __entry->dev = inode->i_sb->s_dev; 1854 __entry->dev = inode->i_sb->s_dev;
1855 __entry->ino = inode->i_ino;
1856 __entry->lblk = lblk; 1856 __entry->lblk = lblk;
1857 __entry->len = len; 1857 __entry->len = len;
1858 ), 1858 ),
@@ -1871,18 +1871,18 @@ TRACE_EVENT(ext4_ext_show_extent,
1871 TP_ARGS(inode, lblk, pblk, len), 1871 TP_ARGS(inode, lblk, pblk, len),
1872 1872
1873 TP_STRUCT__entry( 1873 TP_STRUCT__entry(
1874 __field( ino_t, ino )
1875 __field( dev_t, dev ) 1874 __field( dev_t, dev )
1876 __field( ext4_lblk_t, lblk ) 1875 __field( ino_t, ino )
1877 __field( ext4_fsblk_t, pblk ) 1876 __field( ext4_fsblk_t, pblk )
1877 __field( ext4_lblk_t, lblk )
1878 __field( unsigned short, len ) 1878 __field( unsigned short, len )
1879 ), 1879 ),
1880 1880
1881 TP_fast_assign( 1881 TP_fast_assign(
1882 __entry->ino = inode->i_ino;
1883 __entry->dev = inode->i_sb->s_dev; 1882 __entry->dev = inode->i_sb->s_dev;
1884 __entry->lblk = lblk; 1883 __entry->ino = inode->i_ino;
1885 __entry->pblk = pblk; 1884 __entry->pblk = pblk;
1885 __entry->lblk = lblk;
1886 __entry->len = len; 1886 __entry->len = len;
1887 ), 1887 ),
1888 1888
@@ -1902,25 +1902,25 @@ TRACE_EVENT(ext4_remove_blocks,
1902 TP_ARGS(inode, ex, from, to, partial_cluster), 1902 TP_ARGS(inode, ex, from, to, partial_cluster),
1903 1903
1904 TP_STRUCT__entry( 1904 TP_STRUCT__entry(
1905 __field( ino_t, ino )
1906 __field( dev_t, dev ) 1905 __field( dev_t, dev )
1907 __field( ext4_lblk_t, ee_lblk ) 1906 __field( ino_t, ino )
1908 __field( ext4_fsblk_t, ee_pblk )
1909 __field( unsigned short, ee_len )
1910 __field( ext4_lblk_t, from ) 1907 __field( ext4_lblk_t, from )
1911 __field( ext4_lblk_t, to ) 1908 __field( ext4_lblk_t, to )
1912 __field( ext4_fsblk_t, partial ) 1909 __field( ext4_fsblk_t, partial )
1910 __field( ext4_fsblk_t, ee_pblk )
1911 __field( ext4_lblk_t, ee_lblk )
1912 __field( unsigned short, ee_len )
1913 ), 1913 ),
1914 1914
1915 TP_fast_assign( 1915 TP_fast_assign(
1916 __entry->ino = inode->i_ino;
1917 __entry->dev = inode->i_sb->s_dev; 1916 __entry->dev = inode->i_sb->s_dev;
1918 __entry->ee_lblk = cpu_to_le32(ex->ee_block); 1917 __entry->ino = inode->i_ino;
1919 __entry->ee_pblk = ext4_ext_pblock(ex);
1920 __entry->ee_len = ext4_ext_get_actual_len(ex);
1921 __entry->from = from; 1918 __entry->from = from;
1922 __entry->to = to; 1919 __entry->to = to;
1923 __entry->partial = partial_cluster; 1920 __entry->partial = partial_cluster;
1921 __entry->ee_pblk = ext4_ext_pblock(ex);
1922 __entry->ee_lblk = cpu_to_le32(ex->ee_block);
1923 __entry->ee_len = ext4_ext_get_actual_len(ex);
1924 ), 1924 ),
1925 1925
1926 TP_printk("dev %d,%d ino %lu extent [%u(%llu), %u]" 1926 TP_printk("dev %d,%d ino %lu extent [%u(%llu), %u]"
@@ -1942,23 +1942,23 @@ TRACE_EVENT(ext4_ext_rm_leaf,
1942 TP_ARGS(inode, start, ex, partial_cluster), 1942 TP_ARGS(inode, start, ex, partial_cluster),
1943 1943
1944 TP_STRUCT__entry( 1944 TP_STRUCT__entry(
1945 __field( ino_t, ino )
1946 __field( dev_t, dev ) 1945 __field( dev_t, dev )
1946 __field( ino_t, ino )
1947 __field( ext4_fsblk_t, partial )
1947 __field( ext4_lblk_t, start ) 1948 __field( ext4_lblk_t, start )
1948 __field( ext4_lblk_t, ee_lblk ) 1949 __field( ext4_lblk_t, ee_lblk )
1949 __field( ext4_fsblk_t, ee_pblk ) 1950 __field( ext4_fsblk_t, ee_pblk )
1950 __field( short, ee_len ) 1951 __field( short, ee_len )
1951 __field( ext4_fsblk_t, partial )
1952 ), 1952 ),
1953 1953
1954 TP_fast_assign( 1954 TP_fast_assign(
1955 __entry->ino = inode->i_ino;
1956 __entry->dev = inode->i_sb->s_dev; 1955 __entry->dev = inode->i_sb->s_dev;
1956 __entry->ino = inode->i_ino;
1957 __entry->partial = partial_cluster;
1957 __entry->start = start; 1958 __entry->start = start;
1958 __entry->ee_lblk = le32_to_cpu(ex->ee_block); 1959 __entry->ee_lblk = le32_to_cpu(ex->ee_block);
1959 __entry->ee_pblk = ext4_ext_pblock(ex); 1960 __entry->ee_pblk = ext4_ext_pblock(ex);
1960 __entry->ee_len = ext4_ext_get_actual_len(ex); 1961 __entry->ee_len = ext4_ext_get_actual_len(ex);
1961 __entry->partial = partial_cluster;
1962 ), 1962 ),
1963 1963
1964 TP_printk("dev %d,%d ino %lu start_lblk %u last_extent [%u(%llu), %u]" 1964 TP_printk("dev %d,%d ino %lu start_lblk %u last_extent [%u(%llu), %u]"
@@ -1978,14 +1978,14 @@ TRACE_EVENT(ext4_ext_rm_idx,
1978 TP_ARGS(inode, pblk), 1978 TP_ARGS(inode, pblk),
1979 1979
1980 TP_STRUCT__entry( 1980 TP_STRUCT__entry(
1981 __field( ino_t, ino )
1982 __field( dev_t, dev ) 1981 __field( dev_t, dev )
1982 __field( ino_t, ino )
1983 __field( ext4_fsblk_t, pblk ) 1983 __field( ext4_fsblk_t, pblk )
1984 ), 1984 ),
1985 1985
1986 TP_fast_assign( 1986 TP_fast_assign(
1987 __entry->ino = inode->i_ino;
1988 __entry->dev = inode->i_sb->s_dev; 1987 __entry->dev = inode->i_sb->s_dev;
1988 __entry->ino = inode->i_ino;
1989 __entry->pblk = pblk; 1989 __entry->pblk = pblk;
1990 ), 1990 ),
1991 1991
@@ -2001,15 +2001,15 @@ TRACE_EVENT(ext4_ext_remove_space,
2001 TP_ARGS(inode, start, depth), 2001 TP_ARGS(inode, start, depth),
2002 2002
2003 TP_STRUCT__entry( 2003 TP_STRUCT__entry(
2004 __field( ino_t, ino )
2005 __field( dev_t, dev ) 2004 __field( dev_t, dev )
2005 __field( ino_t, ino )
2006 __field( ext4_lblk_t, start ) 2006 __field( ext4_lblk_t, start )
2007 __field( int, depth ) 2007 __field( int, depth )
2008 ), 2008 ),
2009 2009
2010 TP_fast_assign( 2010 TP_fast_assign(
2011 __entry->ino = inode->i_ino;
2012 __entry->dev = inode->i_sb->s_dev; 2011 __entry->dev = inode->i_sb->s_dev;
2012 __entry->ino = inode->i_ino;
2013 __entry->start = start; 2013 __entry->start = start;
2014 __entry->depth = depth; 2014 __entry->depth = depth;
2015 ), 2015 ),
@@ -2028,8 +2028,8 @@ TRACE_EVENT(ext4_ext_remove_space_done,
2028 TP_ARGS(inode, start, depth, partial, eh_entries), 2028 TP_ARGS(inode, start, depth, partial, eh_entries),
2029 2029
2030 TP_STRUCT__entry( 2030 TP_STRUCT__entry(
2031 __field( ino_t, ino )
2032 __field( dev_t, dev ) 2031 __field( dev_t, dev )
2032 __field( ino_t, ino )
2033 __field( ext4_lblk_t, start ) 2033 __field( ext4_lblk_t, start )
2034 __field( int, depth ) 2034 __field( int, depth )
2035 __field( ext4_lblk_t, partial ) 2035 __field( ext4_lblk_t, partial )
@@ -2037,8 +2037,8 @@ TRACE_EVENT(ext4_ext_remove_space_done,
2037 ), 2037 ),
2038 2038
2039 TP_fast_assign( 2039 TP_fast_assign(
2040 __entry->ino = inode->i_ino;
2041 __entry->dev = inode->i_sb->s_dev; 2040 __entry->dev = inode->i_sb->s_dev;
2041 __entry->ino = inode->i_ino;
2042 __entry->start = start; 2042 __entry->start = start;
2043 __entry->depth = depth; 2043 __entry->depth = depth;
2044 __entry->partial = partial; 2044 __entry->partial = partial;
generated by cgit v1.2.2 (git 2.25.0) at 2026-02-20 11:10:37 -0500