tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ext4: 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.

Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://patch.msgid.link/20260304-iino-u64-v3-9-2257ad83d372@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

authored by

Jeff Layton and committed by
Christian Brauner d3528714 e4290764

+275 -275
+275 -275
include/trace/events/ext4.h
··· 138 138 { CR_ANY_FREE, "CR_ANY_FREE" }) 139 139 140 140 TRACE_EVENT(ext4_other_inode_update_time, 141 - TP_PROTO(struct inode *inode, ino_t orig_ino), 141 + TP_PROTO(struct inode *inode, u64 orig_ino), 142 142 143 143 TP_ARGS(inode, orig_ino), 144 144 145 145 TP_STRUCT__entry( 146 + __field( u64, ino ) 147 + __field( u64, orig_ino ) 146 148 __field( dev_t, dev ) 147 - __field( ino_t, ino ) 148 - __field( ino_t, orig_ino ) 149 149 __field( uid_t, uid ) 150 150 __field( gid_t, gid ) 151 151 __field( __u16, mode ) ··· 160 160 __entry->mode = inode->i_mode; 161 161 ), 162 162 163 - TP_printk("dev %d,%d orig_ino %lu ino %lu mode 0%o uid %u gid %u", 163 + TP_printk("dev %d,%d orig_ino %llu ino %llu mode 0%o uid %u gid %u", 164 164 MAJOR(__entry->dev), MINOR(__entry->dev), 165 - (unsigned long) __entry->orig_ino, 166 - (unsigned long) __entry->ino, __entry->mode, 165 + __entry->orig_ino, 166 + __entry->ino, __entry->mode, 167 167 __entry->uid, __entry->gid) 168 168 ); 169 169 ··· 173 173 TP_ARGS(inode), 174 174 175 175 TP_STRUCT__entry( 176 + __field( u64, ino ) 177 + __field( __u64, blocks ) 176 178 __field( dev_t, dev ) 177 - __field( ino_t, ino ) 178 179 __field( uid_t, uid ) 179 180 __field( gid_t, gid ) 180 - __field( __u64, blocks ) 181 181 __field( __u16, mode ) 182 182 ), 183 183 ··· 190 190 __entry->mode = inode->i_mode; 191 191 ), 192 192 193 - TP_printk("dev %d,%d ino %lu mode 0%o uid %u gid %u blocks %llu", 193 + TP_printk("dev %d,%d ino %llu mode 0%o uid %u gid %u blocks %llu", 194 194 MAJOR(__entry->dev), MINOR(__entry->dev), 195 - (unsigned long) __entry->ino, __entry->mode, 195 + __entry->ino, __entry->mode, 196 196 __entry->uid, __entry->gid, __entry->blocks) 197 197 ); 198 198 ··· 202 202 TP_ARGS(dir, mode), 203 203 204 204 TP_STRUCT__entry( 205 + __field( u64, dir ) 205 206 __field( dev_t, dev ) 206 - __field( ino_t, dir ) 207 207 __field( __u16, mode ) 208 208 ), 209 209 ··· 213 213 __entry->mode = mode; 214 214 ), 215 215 216 - TP_printk("dev %d,%d dir %lu mode 0%o", 216 + TP_printk("dev %d,%d dir %llu mode 0%o", 217 217 MAJOR(__entry->dev), MINOR(__entry->dev), 218 - (unsigned long) __entry->dir, __entry->mode) 218 + __entry->dir, __entry->mode) 219 219 ); 220 220 221 221 TRACE_EVENT(ext4_allocate_inode, ··· 224 224 TP_ARGS(inode, dir, mode), 225 225 226 226 TP_STRUCT__entry( 227 + __field( u64, ino ) 228 + __field( u64, dir ) 227 229 __field( dev_t, dev ) 228 - __field( ino_t, ino ) 229 - __field( ino_t, dir ) 230 230 __field( __u16, mode ) 231 231 ), 232 232 ··· 237 237 __entry->mode = mode; 238 238 ), 239 239 240 - TP_printk("dev %d,%d ino %lu dir %lu mode 0%o", 240 + TP_printk("dev %d,%d ino %llu dir %llu mode 0%o", 241 241 MAJOR(__entry->dev), MINOR(__entry->dev), 242 - (unsigned long) __entry->ino, 243 - (unsigned long) __entry->dir, __entry->mode) 242 + __entry->ino, 243 + __entry->dir, __entry->mode) 244 244 ); 245 245 246 246 TRACE_EVENT(ext4_evict_inode, ··· 249 249 TP_ARGS(inode), 250 250 251 251 TP_STRUCT__entry( 252 + __field( u64, ino ) 252 253 __field( dev_t, dev ) 253 - __field( ino_t, ino ) 254 254 __field( int, nlink ) 255 255 ), 256 256 ··· 260 260 __entry->nlink = inode->i_nlink; 261 261 ), 262 262 263 - TP_printk("dev %d,%d ino %lu nlink %d", 263 + TP_printk("dev %d,%d ino %llu nlink %d", 264 264 MAJOR(__entry->dev), MINOR(__entry->dev), 265 - (unsigned long) __entry->ino, __entry->nlink) 265 + __entry->ino, __entry->nlink) 266 266 ); 267 267 268 268 TRACE_EVENT(ext4_drop_inode, ··· 271 271 TP_ARGS(inode, drop), 272 272 273 273 TP_STRUCT__entry( 274 + __field( u64, ino ) 274 275 __field( dev_t, dev ) 275 - __field( ino_t, ino ) 276 276 __field( int, drop ) 277 277 ), 278 278 ··· 282 282 __entry->drop = drop; 283 283 ), 284 284 285 - TP_printk("dev %d,%d ino %lu drop %d", 285 + TP_printk("dev %d,%d ino %llu drop %d", 286 286 MAJOR(__entry->dev), MINOR(__entry->dev), 287 - (unsigned long) __entry->ino, __entry->drop) 287 + __entry->ino, __entry->drop) 288 288 ); 289 289 290 290 TRACE_EVENT(ext4_nfs_commit_metadata, ··· 293 293 TP_ARGS(inode), 294 294 295 295 TP_STRUCT__entry( 296 + __field( u64, ino ) 296 297 __field( dev_t, dev ) 297 - __field( ino_t, ino ) 298 298 ), 299 299 300 300 TP_fast_assign( ··· 302 302 __entry->ino = inode->i_ino; 303 303 ), 304 304 305 - TP_printk("dev %d,%d ino %lu", 305 + TP_printk("dev %d,%d ino %llu", 306 306 MAJOR(__entry->dev), MINOR(__entry->dev), 307 - (unsigned long) __entry->ino) 307 + __entry->ino) 308 308 ); 309 309 310 310 TRACE_EVENT(ext4_mark_inode_dirty, ··· 313 313 TP_ARGS(inode, IP), 314 314 315 315 TP_STRUCT__entry( 316 - __field( dev_t, dev ) 317 - __field( ino_t, ino ) 316 + __field( u64, ino ) 318 317 __field(unsigned long, ip ) 318 + __field( dev_t, dev ) 319 319 ), 320 320 321 321 TP_fast_assign( ··· 324 324 __entry->ip = IP; 325 325 ), 326 326 327 - TP_printk("dev %d,%d ino %lu caller %pS", 327 + TP_printk("dev %d,%d ino %llu caller %pS", 328 328 MAJOR(__entry->dev), MINOR(__entry->dev), 329 - (unsigned long) __entry->ino, (void *)__entry->ip) 329 + __entry->ino, (void *)__entry->ip) 330 330 ); 331 331 332 332 TRACE_EVENT(ext4_begin_ordered_truncate, ··· 335 335 TP_ARGS(inode, new_size), 336 336 337 337 TP_STRUCT__entry( 338 - __field( dev_t, dev ) 339 - __field( ino_t, ino ) 338 + __field( u64, ino ) 340 339 __field( loff_t, new_size ) 340 + __field( dev_t, dev ) 341 341 ), 342 342 343 343 TP_fast_assign( ··· 346 346 __entry->new_size = new_size; 347 347 ), 348 348 349 - TP_printk("dev %d,%d ino %lu new_size %lld", 349 + TP_printk("dev %d,%d ino %llu new_size %lld", 350 350 MAJOR(__entry->dev), MINOR(__entry->dev), 351 - (unsigned long) __entry->ino, 351 + __entry->ino, 352 352 __entry->new_size) 353 353 ); 354 354 ··· 359 359 TP_ARGS(inode, pos, len), 360 360 361 361 TP_STRUCT__entry( 362 - __field( dev_t, dev ) 363 - __field( ino_t, ino ) 362 + __field( u64, ino ) 364 363 __field( loff_t, pos ) 364 + __field( dev_t, dev ) 365 365 __field( unsigned int, len ) 366 366 ), 367 367 ··· 372 372 __entry->len = len; 373 373 ), 374 374 375 - TP_printk("dev %d,%d ino %lu pos %lld len %u", 375 + TP_printk("dev %d,%d ino %llu pos %lld len %u", 376 376 MAJOR(__entry->dev), MINOR(__entry->dev), 377 - (unsigned long) __entry->ino, 377 + __entry->ino, 378 378 __entry->pos, __entry->len) 379 379 ); 380 380 ··· 399 399 TP_ARGS(inode, pos, len, copied), 400 400 401 401 TP_STRUCT__entry( 402 - __field( dev_t, dev ) 403 - __field( ino_t, ino ) 402 + __field( u64, ino ) 404 403 __field( loff_t, pos ) 404 + __field( dev_t, dev ) 405 405 __field( unsigned int, len ) 406 406 __field( unsigned int, copied ) 407 407 ), ··· 414 414 __entry->copied = copied; 415 415 ), 416 416 417 - TP_printk("dev %d,%d ino %lu pos %lld len %u copied %u", 417 + TP_printk("dev %d,%d ino %llu pos %lld len %u copied %u", 418 418 MAJOR(__entry->dev), MINOR(__entry->dev), 419 - (unsigned long) __entry->ino, 419 + __entry->ino, 420 420 __entry->pos, __entry->len, __entry->copied) 421 421 ); 422 422 ··· 450 450 TP_ARGS(inode, wbc), 451 451 452 452 TP_STRUCT__entry( 453 - __field( dev_t, dev ) 454 - __field( ino_t, ino ) 455 - __field( long, nr_to_write ) 456 - __field( long, pages_skipped ) 453 + __field( u64, ino ) 457 454 __field( loff_t, range_start ) 458 455 __field( loff_t, range_end ) 456 + __field( long, nr_to_write ) 457 + __field( long, pages_skipped ) 459 458 __field( pgoff_t, writeback_index ) 459 + __field( dev_t, dev ) 460 460 __field( int, sync_mode ) 461 461 __field( char, for_kupdate ) 462 462 __field( char, range_cyclic ) ··· 475 475 __entry->range_cyclic = wbc->range_cyclic; 476 476 ), 477 477 478 - TP_printk("dev %d,%d ino %lu nr_to_write %ld pages_skipped %ld " 478 + TP_printk("dev %d,%d ino %llu nr_to_write %ld pages_skipped %ld " 479 479 "range_start %lld range_end %lld sync_mode %d " 480 480 "for_kupdate %d range_cyclic %d writeback_index %lu", 481 481 MAJOR(__entry->dev), MINOR(__entry->dev), 482 - (unsigned long) __entry->ino, __entry->nr_to_write, 482 + __entry->ino, __entry->nr_to_write, 483 483 __entry->pages_skipped, __entry->range_start, 484 484 __entry->range_end, __entry->sync_mode, 485 485 __entry->for_kupdate, __entry->range_cyclic, ··· 493 493 TP_ARGS(inode, start_pos, next_pos, wbc), 494 494 495 495 TP_STRUCT__entry( 496 - __field( dev_t, dev ) 497 - __field( ino_t, ino ) 496 + __field( u64, ino ) 498 497 __field( loff_t, start_pos ) 499 498 __field( loff_t, next_pos ) 500 499 __field( long, nr_to_write ) 500 + __field( dev_t, dev ) 501 501 __field( int, sync_mode ) 502 502 ), 503 503 ··· 510 510 __entry->sync_mode = wbc->sync_mode; 511 511 ), 512 512 513 - TP_printk("dev %d,%d ino %lu start_pos 0x%llx next_pos 0x%llx nr_to_write %ld sync_mode %d", 513 + TP_printk("dev %d,%d ino %llu start_pos 0x%llx next_pos 0x%llx nr_to_write %ld sync_mode %d", 514 514 MAJOR(__entry->dev), MINOR(__entry->dev), 515 - (unsigned long) __entry->ino, __entry->start_pos, __entry->next_pos, 515 + __entry->ino, __entry->start_pos, __entry->next_pos, 516 516 __entry->nr_to_write, __entry->sync_mode) 517 517 ); 518 518 ··· 523 523 TP_ARGS(inode, start_pos, next_pos, wbc, ret), 524 524 525 525 TP_STRUCT__entry( 526 - __field( dev_t, dev ) 527 - __field( ino_t, ino ) 526 + __field( u64, ino ) 528 527 __field( loff_t, start_pos ) 529 528 __field( loff_t, next_pos ) 530 529 __field( long, nr_to_write ) 530 + __field( dev_t, dev ) 531 531 __field( int, ret ) 532 532 ), 533 533 ··· 540 540 __entry->ret = ret; 541 541 ), 542 542 543 - TP_printk("dev %d,%d ino %lu start_pos 0x%llx next_pos 0x%llx nr_to_write %ld ret %d", 543 + TP_printk("dev %d,%d ino %llu start_pos 0x%llx next_pos 0x%llx nr_to_write %ld ret %d", 544 544 MAJOR(__entry->dev), MINOR(__entry->dev), 545 - (unsigned long) __entry->ino, __entry->start_pos, __entry->next_pos, 545 + __entry->ino, __entry->start_pos, __entry->next_pos, 546 546 __entry->nr_to_write, __entry->ret) 547 547 ); 548 548 ··· 552 552 TP_ARGS(inode, map), 553 553 554 554 TP_STRUCT__entry( 555 - __field( dev_t, dev ) 556 - __field( ino_t, ino ) 555 + __field( u64, ino ) 557 556 __field( __u64, lblk ) 557 + __field( dev_t, dev ) 558 558 __field( __u32, len ) 559 559 __field( __u32, flags ) 560 560 ), ··· 567 567 __entry->flags = map->m_flags; 568 568 ), 569 569 570 - TP_printk("dev %d,%d ino %lu lblk %llu len %u flags %s", 570 + TP_printk("dev %d,%d ino %llu lblk %llu len %u flags %s", 571 571 MAJOR(__entry->dev), MINOR(__entry->dev), 572 - (unsigned long) __entry->ino, __entry->lblk, __entry->len, 572 + __entry->ino, __entry->lblk, __entry->len, 573 573 show_mflags(__entry->flags)) 574 574 ); 575 575 ··· 580 580 TP_ARGS(inode, wbc, ret, pages_written), 581 581 582 582 TP_STRUCT__entry( 583 - __field( dev_t, dev ) 584 - __field( ino_t, ino ) 585 - __field( int, ret ) 586 - __field( int, pages_written ) 583 + __field( u64, ino ) 587 584 __field( long, pages_skipped ) 588 585 __field( pgoff_t, writeback_index ) 586 + __field( dev_t, dev ) 587 + __field( int, ret ) 588 + __field( int, pages_written ) 589 589 __field( int, sync_mode ) 590 590 ), 591 591 ··· 599 599 __entry->sync_mode = wbc->sync_mode; 600 600 ), 601 601 602 - TP_printk("dev %d,%d ino %lu ret %d pages_written %d pages_skipped %ld " 602 + TP_printk("dev %d,%d ino %llu ret %d pages_written %d pages_skipped %ld " 603 603 "sync_mode %d writeback_index %lu", 604 604 MAJOR(__entry->dev), MINOR(__entry->dev), 605 - (unsigned long) __entry->ino, __entry->ret, 605 + __entry->ino, __entry->ret, 606 606 __entry->pages_written, __entry->pages_skipped, 607 607 __entry->sync_mode, 608 608 (unsigned long) __entry->writeback_index) ··· 614 614 TP_ARGS(inode, folio), 615 615 616 616 TP_STRUCT__entry( 617 - __field( dev_t, dev ) 618 - __field( ino_t, ino ) 617 + __field( u64, ino ) 619 618 __field( pgoff_t, index ) 619 + __field( dev_t, dev ) 620 620 621 621 ), 622 622 ··· 626 626 __entry->index = folio->index; 627 627 ), 628 628 629 - TP_printk("dev %d,%d ino %lu folio_index %lu", 629 + TP_printk("dev %d,%d ino %llu folio_index %lu", 630 630 MAJOR(__entry->dev), MINOR(__entry->dev), 631 - (unsigned long) __entry->ino, 631 + __entry->ino, 632 632 (unsigned long) __entry->index) 633 633 ); 634 634 ··· 652 652 TP_ARGS(folio, offset, length), 653 653 654 654 TP_STRUCT__entry( 655 - __field( dev_t, dev ) 656 - __field( ino_t, ino ) 655 + __field( u64, ino ) 657 656 __field( pgoff_t, index ) 658 657 __field( size_t, offset ) 659 658 __field( size_t, length ) 659 + __field( dev_t, dev ) 660 660 ), 661 661 662 662 TP_fast_assign( ··· 667 667 __entry->length = length; 668 668 ), 669 669 670 - TP_printk("dev %d,%d ino %lu folio_index %lu offset %zu length %zu", 670 + TP_printk("dev %d,%d ino %llu folio_index %lu offset %zu length %zu", 671 671 MAJOR(__entry->dev), MINOR(__entry->dev), 672 - (unsigned long) __entry->ino, 672 + __entry->ino, 673 673 (unsigned long) __entry->index, 674 674 __entry->offset, __entry->length) 675 675 ); ··· 717 717 TP_ARGS(ac, pa), 718 718 719 719 TP_STRUCT__entry( 720 - __field( dev_t, dev ) 721 - __field( ino_t, ino ) 720 + __field( u64, ino ) 722 721 __field( __u64, pa_pstart ) 723 722 __field( __u64, pa_lstart ) 723 + __field( dev_t, dev ) 724 724 __field( __u32, pa_len ) 725 725 726 726 ), ··· 733 733 __entry->pa_len = pa->pa_len; 734 734 ), 735 735 736 - TP_printk("dev %d,%d ino %lu pstart %llu len %u lstart %llu", 736 + TP_printk("dev %d,%d ino %llu pstart %llu len %u lstart %llu", 737 737 MAJOR(__entry->dev), MINOR(__entry->dev), 738 - (unsigned long) __entry->ino, 738 + __entry->ino, 739 739 __entry->pa_pstart, __entry->pa_len, __entry->pa_lstart) 740 740 ); 741 741 ··· 762 762 TP_ARGS(pa, block, count), 763 763 764 764 TP_STRUCT__entry( 765 - __field( dev_t, dev ) 766 - __field( ino_t, ino ) 765 + __field( u64, ino ) 767 766 __field( __u64, block ) 767 + __field( dev_t, dev ) 768 768 __field( __u32, count ) 769 769 770 770 ), ··· 776 776 __entry->count = count; 777 777 ), 778 778 779 - TP_printk("dev %d,%d ino %lu block %llu count %u", 779 + TP_printk("dev %d,%d ino %llu block %llu count %u", 780 780 MAJOR(__entry->dev), MINOR(__entry->dev), 781 - (unsigned long) __entry->ino, 781 + __entry->ino, 782 782 __entry->block, __entry->count) 783 783 ); 784 784 ··· 811 811 TP_ARGS(inode, len), 812 812 813 813 TP_STRUCT__entry( 814 + __field( u64, ino ) 814 815 __field( dev_t, dev ) 815 - __field( ino_t, ino ) 816 816 __field( unsigned int, len ) 817 817 818 818 ), ··· 823 823 __entry->len = len; 824 824 ), 825 825 826 - TP_printk("dev %d,%d ino %lu len: %u", 826 + TP_printk("dev %d,%d ino %llu len: %u", 827 827 MAJOR(__entry->dev), MINOR(__entry->dev), 828 - (unsigned long) __entry->ino, __entry->len) 828 + __entry->ino, __entry->len) 829 829 ); 830 830 831 831 TRACE_EVENT(ext4_mb_discard_preallocations, ··· 855 855 TP_ARGS(ar), 856 856 857 857 TP_STRUCT__entry( 858 + __field( u64, ino ) 859 + __field( __u64, goal ) 860 + __field( __u64, pleft ) 861 + __field( __u64, pright ) 858 862 __field( dev_t, dev ) 859 - __field( ino_t, ino ) 860 863 __field( unsigned int, len ) 861 864 __field( __u32, logical ) 862 865 __field( __u32, lleft ) 863 866 __field( __u32, lright ) 864 - __field( __u64, goal ) 865 - __field( __u64, pleft ) 866 - __field( __u64, pright ) 867 867 __field( unsigned int, flags ) 868 868 ), 869 869 ··· 880 880 __entry->flags = ar->flags; 881 881 ), 882 882 883 - TP_printk("dev %d,%d ino %lu flags %s len %u lblk %u goal %llu " 883 + TP_printk("dev %d,%d ino %llu flags %s len %u lblk %u goal %llu " 884 884 "lleft %u lright %u pleft %llu pright %llu ", 885 885 MAJOR(__entry->dev), MINOR(__entry->dev), 886 - (unsigned long) __entry->ino, show_mballoc_flags(__entry->flags), 886 + __entry->ino, show_mballoc_flags(__entry->flags), 887 887 __entry->len, __entry->logical, __entry->goal, 888 888 __entry->lleft, __entry->lright, __entry->pleft, 889 889 __entry->pright) ··· 895 895 TP_ARGS(ar, block), 896 896 897 897 TP_STRUCT__entry( 898 - __field( dev_t, dev ) 899 - __field( ino_t, ino ) 898 + __field( u64, ino ) 900 899 __field( __u64, block ) 900 + __field( __u64, goal ) 901 + __field( __u64, pleft ) 902 + __field( __u64, pright ) 903 + __field( dev_t, dev ) 901 904 __field( unsigned int, len ) 902 905 __field( __u32, logical ) 903 906 __field( __u32, lleft ) 904 907 __field( __u32, lright ) 905 - __field( __u64, goal ) 906 - __field( __u64, pleft ) 907 - __field( __u64, pright ) 908 908 __field( unsigned int, flags ) 909 909 ), 910 910 ··· 922 922 __entry->flags = ar->flags; 923 923 ), 924 924 925 - TP_printk("dev %d,%d ino %lu flags %s len %u block %llu lblk %u " 925 + TP_printk("dev %d,%d ino %llu flags %s len %u block %llu lblk %u " 926 926 "goal %llu lleft %u lright %u pleft %llu pright %llu", 927 927 MAJOR(__entry->dev), MINOR(__entry->dev), 928 - (unsigned long) __entry->ino, show_mballoc_flags(__entry->flags), 928 + __entry->ino, show_mballoc_flags(__entry->flags), 929 929 __entry->len, __entry->block, __entry->logical, 930 930 __entry->goal, __entry->lleft, __entry->lright, 931 931 __entry->pleft, __entry->pright) ··· 938 938 TP_ARGS(inode, block, count, flags), 939 939 940 940 TP_STRUCT__entry( 941 - __field( dev_t, dev ) 942 - __field( ino_t, ino ) 941 + __field( u64, ino ) 943 942 __field( __u64, block ) 944 943 __field( unsigned long, count ) 944 + __field( dev_t, dev ) 945 945 __field( int, flags ) 946 946 __field( __u16, mode ) 947 947 ), ··· 955 955 __entry->mode = inode->i_mode; 956 956 ), 957 957 958 - TP_printk("dev %d,%d ino %lu mode 0%o block %llu count %lu flags %s", 958 + TP_printk("dev %d,%d ino %llu mode 0%o block %llu count %lu flags %s", 959 959 MAJOR(__entry->dev), MINOR(__entry->dev), 960 - (unsigned long) __entry->ino, 960 + __entry->ino, 961 961 __entry->mode, __entry->block, __entry->count, 962 962 show_free_flags(__entry->flags)) 963 963 ); ··· 968 968 TP_ARGS(file, datasync), 969 969 970 970 TP_STRUCT__entry( 971 + __field( u64, ino ) 972 + __field( u64, parent ) 971 973 __field( dev_t, dev ) 972 - __field( ino_t, ino ) 973 - __field( ino_t, parent ) 974 974 __field( int, datasync ) 975 975 ), 976 976 ··· 983 983 __entry->parent = d_inode(dentry->d_parent)->i_ino; 984 984 ), 985 985 986 - TP_printk("dev %d,%d ino %lu parent %lu datasync %d ", 986 + TP_printk("dev %d,%d ino %llu parent %llu datasync %d ", 987 987 MAJOR(__entry->dev), MINOR(__entry->dev), 988 - (unsigned long) __entry->ino, 989 - (unsigned long) __entry->parent, __entry->datasync) 988 + __entry->ino, 989 + __entry->parent, __entry->datasync) 990 990 ); 991 991 992 992 TRACE_EVENT(ext4_sync_file_exit, ··· 995 995 TP_ARGS(inode, ret), 996 996 997 997 TP_STRUCT__entry( 998 + __field( u64, ino ) 998 999 __field( dev_t, dev ) 999 - __field( ino_t, ino ) 1000 1000 __field( int, ret ) 1001 1001 ), 1002 1002 ··· 1006 1006 __entry->ret = ret; 1007 1007 ), 1008 1008 1009 - TP_printk("dev %d,%d ino %lu ret %d", 1009 + TP_printk("dev %d,%d ino %llu ret %d", 1010 1010 MAJOR(__entry->dev), MINOR(__entry->dev), 1011 - (unsigned long) __entry->ino, 1011 + __entry->ino, 1012 1012 __entry->ret) 1013 1013 ); 1014 1014 ··· 1039 1039 TP_ARGS(inode), 1040 1040 1041 1041 TP_STRUCT__entry( 1042 + __field( u64, ino ) 1042 1043 __field( dev_t, dev ) 1043 - __field( ino_t, ino ) 1044 1044 __field( unsigned int, data_blocks ) 1045 1045 ), 1046 1046 ··· 1050 1050 __entry->data_blocks = EXT4_I(inode)->i_reserved_data_blocks; 1051 1051 ), 1052 1052 1053 - TP_printk("dev %d,%d ino %lu reserved_data_blocks %u", 1053 + TP_printk("dev %d,%d ino %llu reserved_data_blocks %u", 1054 1054 MAJOR(__entry->dev), MINOR(__entry->dev), 1055 - (unsigned long) __entry->ino, 1055 + __entry->ino, 1056 1056 __entry->data_blocks) 1057 1057 ); 1058 1058 ··· 1062 1062 TP_ARGS(ac), 1063 1063 1064 1064 TP_STRUCT__entry( 1065 + __field( u64, ino ) 1065 1066 __field( dev_t, dev ) 1066 - __field( ino_t, ino ) 1067 1067 __field( __u32, orig_logical ) 1068 1068 __field( int, orig_start ) 1069 1069 __field( __u32, orig_group ) ··· 1107 1107 __entry->cr = ac->ac_criteria; 1108 1108 ), 1109 1109 1110 - TP_printk("dev %d,%d inode %lu orig %u/%d/%u@%u goal %u/%d/%u@%u " 1110 + TP_printk("dev %d,%d inode %llu orig %u/%d/%u@%u goal %u/%d/%u@%u " 1111 1111 "result %u/%d/%u@%u blks %u grps %u cr %s flags %s " 1112 1112 "tail %u broken %u", 1113 1113 MAJOR(__entry->dev), MINOR(__entry->dev), 1114 - (unsigned long) __entry->ino, 1114 + __entry->ino, 1115 1115 __entry->orig_group, __entry->orig_start, 1116 1116 __entry->orig_len, __entry->orig_logical, 1117 1117 __entry->goal_group, __entry->goal_start, ··· 1129 1129 TP_ARGS(ac), 1130 1130 1131 1131 TP_STRUCT__entry( 1132 + __field( u64, ino ) 1132 1133 __field( dev_t, dev ) 1133 - __field( ino_t, ino ) 1134 1134 __field( __u32, orig_logical ) 1135 1135 __field( int, orig_start ) 1136 1136 __field( __u32, orig_group ) ··· 1154 1154 __entry->result_len = ac->ac_b_ex.fe_len; 1155 1155 ), 1156 1156 1157 - TP_printk("dev %d,%d inode %lu orig %u/%d/%u@%u result %u/%d/%u@%u", 1157 + TP_printk("dev %d,%d inode %llu orig %u/%d/%u@%u result %u/%d/%u@%u", 1158 1158 MAJOR(__entry->dev), MINOR(__entry->dev), 1159 - (unsigned long) __entry->ino, 1159 + __entry->ino, 1160 1160 __entry->orig_group, __entry->orig_start, 1161 1161 __entry->orig_len, __entry->orig_logical, 1162 1162 __entry->result_group, __entry->result_start, ··· 1173 1173 TP_ARGS(sb, inode, group, start, len), 1174 1174 1175 1175 TP_STRUCT__entry( 1176 + __field( u64, ino ) 1176 1177 __field( dev_t, dev ) 1177 - __field( ino_t, ino ) 1178 1178 __field( int, result_start ) 1179 1179 __field( __u32, result_group ) 1180 1180 __field( int, result_len ) ··· 1188 1188 __entry->result_len = len; 1189 1189 ), 1190 1190 1191 - TP_printk("dev %d,%d inode %lu extent %u/%d/%d ", 1191 + TP_printk("dev %d,%d inode %llu extent %u/%d/%d ", 1192 1192 MAJOR(__entry->dev), MINOR(__entry->dev), 1193 - (unsigned long) __entry->ino, 1193 + __entry->ino, 1194 1194 __entry->result_group, __entry->result_start, 1195 1195 __entry->result_len) 1196 1196 ); ··· 1223 1223 TP_ARGS(inode, is_metadata, block), 1224 1224 1225 1225 TP_STRUCT__entry( 1226 - __field( dev_t, dev ) 1227 - __field( ino_t, ino ) 1226 + __field( u64, ino ) 1228 1227 __field( __u64, block ) 1228 + __field( dev_t, dev ) 1229 1229 __field( int, is_metadata ) 1230 1230 __field( __u16, mode ) 1231 1231 ), ··· 1238 1238 __entry->mode = inode->i_mode; 1239 1239 ), 1240 1240 1241 - TP_printk("dev %d,%d ino %lu mode 0%o is_metadata %d block %llu", 1241 + TP_printk("dev %d,%d ino %llu mode 0%o is_metadata %d block %llu", 1242 1242 MAJOR(__entry->dev), MINOR(__entry->dev), 1243 - (unsigned long) __entry->ino, 1243 + __entry->ino, 1244 1244 __entry->mode, __entry->is_metadata, __entry->block) 1245 1245 ); 1246 1246 ··· 1250 1250 TP_ARGS(inode, used_blocks, quota_claim), 1251 1251 1252 1252 TP_STRUCT__entry( 1253 - __field( dev_t, dev ) 1254 - __field( ino_t, ino ) 1253 + __field( u64, ino ) 1255 1254 __field( __u64, i_blocks ) 1255 + __field( dev_t, dev ) 1256 1256 __field( int, used_blocks ) 1257 1257 __field( int, reserved_data_blocks ) 1258 1258 __field( int, quota_claim ) ··· 1270 1270 __entry->mode = inode->i_mode; 1271 1271 ), 1272 1272 1273 - TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu used_blocks %d " 1273 + TP_printk("dev %d,%d ino %llu mode 0%o i_blocks %llu used_blocks %d " 1274 1274 "reserved_data_blocks %d quota_claim %d", 1275 1275 MAJOR(__entry->dev), MINOR(__entry->dev), 1276 - (unsigned long) __entry->ino, 1276 + __entry->ino, 1277 1277 __entry->mode, __entry->i_blocks, 1278 1278 __entry->used_blocks, __entry->reserved_data_blocks, 1279 1279 __entry->quota_claim) ··· 1285 1285 TP_ARGS(inode, nr_resv), 1286 1286 1287 1287 TP_STRUCT__entry( 1288 - __field( dev_t, dev ) 1289 - __field( ino_t, ino ) 1288 + __field( u64, ino ) 1290 1289 __field( __u64, i_blocks ) 1290 + __field( dev_t, dev ) 1291 1291 __field( int, reserve_blocks ) 1292 1292 __field( int, reserved_data_blocks ) 1293 1293 __field( __u16, mode ) ··· 1302 1302 __entry->mode = inode->i_mode; 1303 1303 ), 1304 1304 1305 - TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu reserve_blocks %d" 1305 + TP_printk("dev %d,%d ino %llu mode 0%o i_blocks %llu reserve_blocks %d" 1306 1306 "reserved_data_blocks %d", 1307 1307 MAJOR(__entry->dev), MINOR(__entry->dev), 1308 - (unsigned long) __entry->ino, 1308 + __entry->ino, 1309 1309 __entry->mode, __entry->i_blocks, 1310 1310 __entry->reserve_blocks, __entry->reserved_data_blocks) 1311 1311 ); ··· 1316 1316 TP_ARGS(inode, freed_blocks), 1317 1317 1318 1318 TP_STRUCT__entry( 1319 - __field( dev_t, dev ) 1320 - __field( ino_t, ino ) 1319 + __field( u64, ino ) 1321 1320 __field( __u64, i_blocks ) 1321 + __field( dev_t, dev ) 1322 1322 __field( int, freed_blocks ) 1323 1323 __field( int, reserved_data_blocks ) 1324 1324 __field( __u16, mode ) ··· 1333 1333 __entry->mode = inode->i_mode; 1334 1334 ), 1335 1335 1336 - TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu freed_blocks %d " 1336 + TP_printk("dev %d,%d ino %llu mode 0%o i_blocks %llu freed_blocks %d " 1337 1337 "reserved_data_blocks %d", 1338 1338 MAJOR(__entry->dev), MINOR(__entry->dev), 1339 - (unsigned long) __entry->ino, 1339 + __entry->ino, 1340 1340 __entry->mode, __entry->i_blocks, 1341 1341 __entry->freed_blocks, __entry->reserved_data_blocks) 1342 1342 ); ··· 1412 1412 TP_ARGS(inode, offset, len, mode), 1413 1413 1414 1414 TP_STRUCT__entry( 1415 - __field( dev_t, dev ) 1416 - __field( ino_t, ino ) 1415 + __field( u64, ino ) 1417 1416 __field( loff_t, offset ) 1418 1417 __field( loff_t, len ) 1418 + __field( dev_t, dev ) 1419 1419 __field( int, mode ) 1420 1420 ), 1421 1421 ··· 1427 1427 __entry->mode = mode; 1428 1428 ), 1429 1429 1430 - TP_printk("dev %d,%d ino %lu offset %lld len %lld mode %s", 1430 + TP_printk("dev %d,%d ino %llu offset %lld len %lld mode %s", 1431 1431 MAJOR(__entry->dev), MINOR(__entry->dev), 1432 - (unsigned long) __entry->ino, 1432 + __entry->ino, 1433 1433 __entry->offset, __entry->len, 1434 1434 show_falloc_mode(__entry->mode)) 1435 1435 ); ··· 1462 1462 TP_ARGS(inode, offset, max_blocks, ret), 1463 1463 1464 1464 TP_STRUCT__entry( 1465 - __field( dev_t, dev ) 1466 - __field( ino_t, ino ) 1465 + __field( u64, ino ) 1467 1466 __field( loff_t, pos ) 1467 + __field( dev_t, dev ) 1468 1468 __field( unsigned int, blocks ) 1469 1469 __field( int, ret ) 1470 1470 ), ··· 1477 1477 __entry->ret = ret; 1478 1478 ), 1479 1479 1480 - TP_printk("dev %d,%d ino %lu pos %lld blocks %u ret %d", 1480 + TP_printk("dev %d,%d ino %llu pos %lld blocks %u ret %d", 1481 1481 MAJOR(__entry->dev), MINOR(__entry->dev), 1482 - (unsigned long) __entry->ino, 1482 + __entry->ino, 1483 1483 __entry->pos, __entry->blocks, 1484 1484 __entry->ret) 1485 1485 ); ··· 1490 1490 TP_ARGS(parent, dentry), 1491 1491 1492 1492 TP_STRUCT__entry( 1493 - __field( dev_t, dev ) 1494 - __field( ino_t, ino ) 1495 - __field( ino_t, parent ) 1493 + __field( u64, ino ) 1494 + __field( u64, parent ) 1496 1495 __field( loff_t, size ) 1496 + __field( dev_t, dev ) 1497 1497 ), 1498 1498 1499 1499 TP_fast_assign( ··· 1503 1503 __entry->size = d_inode(dentry)->i_size; 1504 1504 ), 1505 1505 1506 - TP_printk("dev %d,%d ino %lu size %lld parent %lu", 1506 + TP_printk("dev %d,%d ino %llu size %lld parent %llu", 1507 1507 MAJOR(__entry->dev), MINOR(__entry->dev), 1508 - (unsigned long) __entry->ino, __entry->size, 1509 - (unsigned long) __entry->parent) 1508 + __entry->ino, __entry->size, 1509 + __entry->parent) 1510 1510 ); 1511 1511 1512 1512 TRACE_EVENT(ext4_unlink_exit, ··· 1515 1515 TP_ARGS(dentry, ret), 1516 1516 1517 1517 TP_STRUCT__entry( 1518 + __field( u64, ino ) 1518 1519 __field( dev_t, dev ) 1519 - __field( ino_t, ino ) 1520 1520 __field( int, ret ) 1521 1521 ), 1522 1522 ··· 1526 1526 __entry->ret = ret; 1527 1527 ), 1528 1528 1529 - TP_printk("dev %d,%d ino %lu ret %d", 1529 + TP_printk("dev %d,%d ino %llu ret %d", 1530 1530 MAJOR(__entry->dev), MINOR(__entry->dev), 1531 - (unsigned long) __entry->ino, 1531 + __entry->ino, 1532 1532 __entry->ret) 1533 1533 ); 1534 1534 ··· 1538 1538 TP_ARGS(inode), 1539 1539 1540 1540 TP_STRUCT__entry( 1541 - __field( dev_t, dev ) 1542 - __field( ino_t, ino ) 1541 + __field( u64, ino ) 1543 1542 __field( __u64, blocks ) 1543 + __field( dev_t, dev ) 1544 1544 ), 1545 1545 1546 1546 TP_fast_assign( ··· 1549 1549 __entry->blocks = inode->i_blocks; 1550 1550 ), 1551 1551 1552 - TP_printk("dev %d,%d ino %lu blocks %llu", 1552 + TP_printk("dev %d,%d ino %llu blocks %llu", 1553 1553 MAJOR(__entry->dev), MINOR(__entry->dev), 1554 - (unsigned long) __entry->ino, __entry->blocks) 1554 + __entry->ino, __entry->blocks) 1555 1555 ); 1556 1556 1557 1557 DEFINE_EVENT(ext4__truncate, ext4_truncate_enter, ··· 1576 1576 TP_ARGS(inode, map, ux), 1577 1577 1578 1578 TP_STRUCT__entry( 1579 + __field( u64, ino ) 1580 + __field( ext4_fsblk_t, u_pblk ) 1579 1581 __field( dev_t, dev ) 1580 - __field( ino_t, ino ) 1581 1582 __field( ext4_lblk_t, m_lblk ) 1582 1583 __field( unsigned, m_len ) 1583 1584 __field( ext4_lblk_t, u_lblk ) 1584 1585 __field( unsigned, u_len ) 1585 - __field( ext4_fsblk_t, u_pblk ) 1586 1586 ), 1587 1587 1588 1588 TP_fast_assign( ··· 1595 1595 __entry->u_pblk = ext4_ext_pblock(ux); 1596 1596 ), 1597 1597 1598 - TP_printk("dev %d,%d ino %lu m_lblk %u m_len %u u_lblk %u u_len %u " 1598 + TP_printk("dev %d,%d ino %llu m_lblk %u m_len %u u_lblk %u u_len %u " 1599 1599 "u_pblk %llu", 1600 1600 MAJOR(__entry->dev), MINOR(__entry->dev), 1601 - (unsigned long) __entry->ino, 1601 + __entry->ino, 1602 1602 __entry->m_lblk, __entry->m_len, 1603 1603 __entry->u_lblk, __entry->u_len, __entry->u_pblk) 1604 1604 ); ··· 1614 1614 TP_ARGS(inode, map, ux, ix), 1615 1615 1616 1616 TP_STRUCT__entry( 1617 + __field( u64, ino ) 1618 + __field( ext4_fsblk_t, u_pblk ) 1619 + __field( ext4_fsblk_t, i_pblk ) 1617 1620 __field( dev_t, dev ) 1618 - __field( ino_t, ino ) 1619 1621 __field( ext4_lblk_t, m_lblk ) 1620 1622 __field( unsigned, m_len ) 1621 1623 __field( ext4_lblk_t, u_lblk ) 1622 1624 __field( unsigned, u_len ) 1623 - __field( ext4_fsblk_t, u_pblk ) 1624 1625 __field( ext4_lblk_t, i_lblk ) 1625 1626 __field( unsigned, i_len ) 1626 - __field( ext4_fsblk_t, i_pblk ) 1627 1627 ), 1628 1628 1629 1629 TP_fast_assign( ··· 1639 1639 __entry->i_pblk = ext4_ext_pblock(ix); 1640 1640 ), 1641 1641 1642 - TP_printk("dev %d,%d ino %lu m_lblk %u m_len %u " 1642 + TP_printk("dev %d,%d ino %llu m_lblk %u m_len %u " 1643 1643 "u_lblk %u u_len %u u_pblk %llu " 1644 1644 "i_lblk %u i_len %u i_pblk %llu ", 1645 1645 MAJOR(__entry->dev), MINOR(__entry->dev), 1646 - (unsigned long) __entry->ino, 1646 + __entry->ino, 1647 1647 __entry->m_lblk, __entry->m_len, 1648 1648 __entry->u_lblk, __entry->u_len, __entry->u_pblk, 1649 1649 __entry->i_lblk, __entry->i_len, __entry->i_pblk) ··· 1656 1656 TP_ARGS(inode, lblk, len, flags), 1657 1657 1658 1658 TP_STRUCT__entry( 1659 + __field( u64, ino ) 1659 1660 __field( dev_t, dev ) 1660 - __field( ino_t, ino ) 1661 1661 __field( ext4_lblk_t, lblk ) 1662 1662 __field( unsigned int, len ) 1663 1663 __field( unsigned int, flags ) ··· 1671 1671 __entry->flags = flags; 1672 1672 ), 1673 1673 1674 - TP_printk("dev %d,%d ino %lu lblk %u len %u flags %s", 1674 + TP_printk("dev %d,%d ino %llu lblk %u len %u flags %s", 1675 1675 MAJOR(__entry->dev), MINOR(__entry->dev), 1676 - (unsigned long) __entry->ino, 1676 + __entry->ino, 1677 1677 __entry->lblk, __entry->len, show_map_flags(__entry->flags)) 1678 1678 ); 1679 1679 ··· 1698 1698 TP_ARGS(inode, flags, map, ret), 1699 1699 1700 1700 TP_STRUCT__entry( 1701 - __field( dev_t, dev ) 1702 - __field( ino_t, ino ) 1703 - __field( unsigned int, flags ) 1701 + __field( u64, ino ) 1704 1702 __field( ext4_fsblk_t, pblk ) 1703 + __field( dev_t, dev ) 1704 + __field( unsigned int, flags ) 1705 1705 __field( ext4_lblk_t, lblk ) 1706 1706 __field( unsigned int, len ) 1707 1707 __field( unsigned int, mflags ) ··· 1719 1719 __entry->ret = ret; 1720 1720 ), 1721 1721 1722 - TP_printk("dev %d,%d ino %lu flags %s lblk %u pblk %llu len %u " 1722 + TP_printk("dev %d,%d ino %llu flags %s lblk %u pblk %llu len %u " 1723 1723 "mflags %s ret %d", 1724 1724 MAJOR(__entry->dev), MINOR(__entry->dev), 1725 - (unsigned long) __entry->ino, 1725 + __entry->ino, 1726 1726 show_map_flags(__entry->flags), __entry->lblk, __entry->pblk, 1727 1727 __entry->len, show_mflags(__entry->mflags), __entry->ret) 1728 1728 ); ··· 1747 1747 TP_ARGS(inode, lblk, pblk), 1748 1748 1749 1749 TP_STRUCT__entry( 1750 - __field( dev_t, dev ) 1751 - __field( ino_t, ino ) 1750 + __field( u64, ino ) 1752 1751 __field( ext4_fsblk_t, pblk ) 1752 + __field( dev_t, dev ) 1753 1753 __field( ext4_lblk_t, lblk ) 1754 1754 ), 1755 1755 ··· 1760 1760 __entry->lblk = lblk; 1761 1761 ), 1762 1762 1763 - TP_printk("dev %d,%d ino %lu lblk %u pblk %llu", 1763 + TP_printk("dev %d,%d ino %llu lblk %u pblk %llu", 1764 1764 MAJOR(__entry->dev), MINOR(__entry->dev), 1765 - (unsigned long) __entry->ino, 1765 + __entry->ino, 1766 1766 __entry->lblk, __entry->pblk) 1767 1767 ); 1768 1768 ··· 1772 1772 TP_ARGS(sb, ino), 1773 1773 1774 1774 TP_STRUCT__entry( 1775 + __field( u64, ino ) 1775 1776 __field( dev_t, dev ) 1776 - __field( ino_t, ino ) 1777 1777 ), 1778 1778 1779 1779 TP_fast_assign( ··· 1781 1781 __entry->ino = ino; 1782 1782 ), 1783 1783 1784 - TP_printk("dev %d,%d ino %ld", 1784 + TP_printk("dev %d,%d ino %lld", 1785 1785 MAJOR(__entry->dev), MINOR(__entry->dev), 1786 - (unsigned long) __entry->ino) 1786 + __entry->ino) 1787 1787 ); 1788 1788 1789 1789 TRACE_EVENT(ext4_journal_start_sb, ··· 1823 1823 TP_ARGS(inode, blocks, rsv_blocks, revoke_creds, type, IP), 1824 1824 1825 1825 TP_STRUCT__entry( 1826 - __field( unsigned long, ino ) 1826 + __field( u64, ino ) 1827 1827 __field( dev_t, dev ) 1828 1828 __field( unsigned long, ip ) 1829 1829 __field( int, blocks ) ··· 1843 1843 ), 1844 1844 1845 1845 TP_printk("dev %d,%d blocks %d, rsv_blocks %d, revoke_creds %d," 1846 - " type %d, ino %lu, caller %pS", MAJOR(__entry->dev), 1846 + " type %d, ino %llu, caller %pS", MAJOR(__entry->dev), 1847 1847 MINOR(__entry->dev), __entry->blocks, __entry->rsv_blocks, 1848 - __entry->revoke_creds, __entry->type, __entry->ino, 1849 - (void *)__entry->ip) 1848 + __entry->revoke_creds, __entry->type, 1849 + __entry->ino, (void *)__entry->ip) 1850 1850 ); 1851 1851 1852 1852 TRACE_EVENT(ext4_journal_start_reserved, ··· 1927 1927 TP_ARGS(inode, map, flags, allocated, newblock), 1928 1928 1929 1929 TP_STRUCT__entry( 1930 + __field( u64, ino ) 1931 + __field( ext4_fsblk_t, pblk ) 1932 + __field( ext4_fsblk_t, newblk ) 1930 1933 __field( dev_t, dev ) 1931 - __field( ino_t, ino ) 1932 1934 __field( int, flags ) 1933 1935 __field( ext4_lblk_t, lblk ) 1934 - __field( ext4_fsblk_t, pblk ) 1935 1936 __field( unsigned int, len ) 1936 1937 __field( unsigned int, allocated ) 1937 - __field( ext4_fsblk_t, newblk ) 1938 1938 ), 1939 1939 1940 1940 TP_fast_assign( ··· 1948 1948 __entry->newblk = newblock; 1949 1949 ), 1950 1950 1951 - TP_printk("dev %d,%d ino %lu m_lblk %u m_pblk %llu m_len %u flags %s " 1951 + TP_printk("dev %d,%d ino %llu m_lblk %u m_pblk %llu m_len %u flags %s " 1952 1952 "allocated %d newblock %llu", 1953 1953 MAJOR(__entry->dev), MINOR(__entry->dev), 1954 - (unsigned long) __entry->ino, 1954 + __entry->ino, 1955 1955 (unsigned) __entry->lblk, (unsigned long long) __entry->pblk, 1956 1956 __entry->len, show_map_flags(__entry->flags), 1957 1957 (unsigned int) __entry->allocated, ··· 1994 1994 TP_ARGS(inode, lblk, pblk, len), 1995 1995 1996 1996 TP_STRUCT__entry( 1997 - __field( dev_t, dev ) 1998 - __field( ino_t, ino ) 1997 + __field( u64, ino ) 1999 1998 __field( ext4_fsblk_t, pblk ) 1999 + __field( dev_t, dev ) 2000 2000 __field( ext4_lblk_t, lblk ) 2001 2001 __field( unsigned short, len ) 2002 2002 ), ··· 2009 2009 __entry->len = len; 2010 2010 ), 2011 2011 2012 - TP_printk("dev %d,%d ino %lu lblk %u pblk %llu len %u", 2012 + TP_printk("dev %d,%d ino %llu lblk %u pblk %llu len %u", 2013 2013 MAJOR(__entry->dev), MINOR(__entry->dev), 2014 - (unsigned long) __entry->ino, 2014 + __entry->ino, 2015 2015 (unsigned) __entry->lblk, 2016 2016 (unsigned long long) __entry->pblk, 2017 2017 (unsigned short) __entry->len) ··· 2025 2025 TP_ARGS(inode, ex, from, to, pc), 2026 2026 2027 2027 TP_STRUCT__entry( 2028 + __field( u64, ino ) 2029 + __field( ext4_fsblk_t, ee_pblk ) 2030 + __field( ext4_fsblk_t, pc_pclu ) 2028 2031 __field( dev_t, dev ) 2029 - __field( ino_t, ino ) 2030 2032 __field( ext4_lblk_t, from ) 2031 2033 __field( ext4_lblk_t, to ) 2032 - __field( ext4_fsblk_t, ee_pblk ) 2033 2034 __field( ext4_lblk_t, ee_lblk ) 2034 2035 __field( unsigned short, ee_len ) 2035 - __field( ext4_fsblk_t, pc_pclu ) 2036 2036 __field( ext4_lblk_t, pc_lblk ) 2037 2037 __field( int, pc_state) 2038 2038 ), ··· 2050 2050 __entry->pc_state = pc->state; 2051 2051 ), 2052 2052 2053 - TP_printk("dev %d,%d ino %lu extent [%u(%llu), %u]" 2053 + TP_printk("dev %d,%d ino %llu extent [%u(%llu), %u]" 2054 2054 "from %u to %u partial [pclu %lld lblk %u state %d]", 2055 2055 MAJOR(__entry->dev), MINOR(__entry->dev), 2056 - (unsigned long) __entry->ino, 2056 + __entry->ino, 2057 2057 (unsigned) __entry->ee_lblk, 2058 2058 (unsigned long long) __entry->ee_pblk, 2059 2059 (unsigned short) __entry->ee_len, ··· 2072 2072 TP_ARGS(inode, start, ex, pc), 2073 2073 2074 2074 TP_STRUCT__entry( 2075 + __field( u64, ino ) 2076 + __field( ext4_fsblk_t, ee_pblk ) 2077 + __field( ext4_fsblk_t, pc_pclu ) 2075 2078 __field( dev_t, dev ) 2076 - __field( ino_t, ino ) 2077 2079 __field( ext4_lblk_t, start ) 2078 2080 __field( ext4_lblk_t, ee_lblk ) 2079 - __field( ext4_fsblk_t, ee_pblk ) 2080 2081 __field( short, ee_len ) 2081 - __field( ext4_fsblk_t, pc_pclu ) 2082 2082 __field( ext4_lblk_t, pc_lblk ) 2083 2083 __field( int, pc_state) 2084 2084 ), ··· 2095 2095 __entry->pc_state = pc->state; 2096 2096 ), 2097 2097 2098 - TP_printk("dev %d,%d ino %lu start_lblk %u last_extent [%u(%llu), %u]" 2098 + TP_printk("dev %d,%d ino %llu start_lblk %u last_extent [%u(%llu), %u]" 2099 2099 "partial [pclu %lld lblk %u state %d]", 2100 2100 MAJOR(__entry->dev), MINOR(__entry->dev), 2101 - (unsigned long) __entry->ino, 2101 + __entry->ino, 2102 2102 (unsigned) __entry->start, 2103 2103 (unsigned) __entry->ee_lblk, 2104 2104 (unsigned long long) __entry->ee_pblk, ··· 2114 2114 TP_ARGS(inode, pblk), 2115 2115 2116 2116 TP_STRUCT__entry( 2117 - __field( dev_t, dev ) 2118 - __field( ino_t, ino ) 2117 + __field( u64, ino ) 2119 2118 __field( ext4_fsblk_t, pblk ) 2119 + __field( dev_t, dev ) 2120 2120 ), 2121 2121 2122 2122 TP_fast_assign( ··· 2125 2125 __entry->pblk = pblk; 2126 2126 ), 2127 2127 2128 - TP_printk("dev %d,%d ino %lu index_pblk %llu", 2128 + TP_printk("dev %d,%d ino %llu index_pblk %llu", 2129 2129 MAJOR(__entry->dev), MINOR(__entry->dev), 2130 - (unsigned long) __entry->ino, 2130 + __entry->ino, 2131 2131 (unsigned long long) __entry->pblk) 2132 2132 ); 2133 2133 ··· 2138 2138 TP_ARGS(inode, start, end, depth), 2139 2139 2140 2140 TP_STRUCT__entry( 2141 + __field( u64, ino ) 2141 2142 __field( dev_t, dev ) 2142 - __field( ino_t, ino ) 2143 2143 __field( ext4_lblk_t, start ) 2144 2144 __field( ext4_lblk_t, end ) 2145 2145 __field( int, depth ) ··· 2153 2153 __entry->depth = depth; 2154 2154 ), 2155 2155 2156 - TP_printk("dev %d,%d ino %lu since %u end %u depth %d", 2156 + TP_printk("dev %d,%d ino %llu since %u end %u depth %d", 2157 2157 MAJOR(__entry->dev), MINOR(__entry->dev), 2158 - (unsigned long) __entry->ino, 2158 + __entry->ino, 2159 2159 (unsigned) __entry->start, 2160 2160 (unsigned) __entry->end, 2161 2161 __entry->depth) ··· 2168 2168 TP_ARGS(inode, start, end, depth, pc, eh_entries), 2169 2169 2170 2170 TP_STRUCT__entry( 2171 + __field( u64, ino ) 2172 + __field( ext4_fsblk_t, pc_pclu ) 2171 2173 __field( dev_t, dev ) 2172 - __field( ino_t, ino ) 2173 2174 __field( ext4_lblk_t, start ) 2174 2175 __field( ext4_lblk_t, end ) 2175 2176 __field( int, depth ) 2176 - __field( ext4_fsblk_t, pc_pclu ) 2177 2177 __field( ext4_lblk_t, pc_lblk ) 2178 2178 __field( int, pc_state ) 2179 2179 __field( unsigned short, eh_entries ) ··· 2191 2191 __entry->eh_entries = le16_to_cpu(eh_entries); 2192 2192 ), 2193 2193 2194 - TP_printk("dev %d,%d ino %lu since %u end %u depth %d " 2194 + TP_printk("dev %d,%d ino %llu since %u end %u depth %d " 2195 2195 "partial [pclu %lld lblk %u state %d] " 2196 2196 "remaining_entries %u", 2197 2197 MAJOR(__entry->dev), MINOR(__entry->dev), 2198 - (unsigned long) __entry->ino, 2198 + __entry->ino, 2199 2199 (unsigned) __entry->start, 2200 2200 (unsigned) __entry->end, 2201 2201 __entry->depth, ··· 2211 2211 TP_ARGS(inode, es), 2212 2212 2213 2213 TP_STRUCT__entry( 2214 + __field( u64, ino ) 2215 + __field( u64, seq ) 2216 + __field( ext4_fsblk_t, pblk ) 2214 2217 __field( dev_t, dev ) 2215 - __field( ino_t, ino ) 2216 2218 __field( ext4_lblk_t, lblk ) 2217 2219 __field( ext4_lblk_t, len ) 2218 - __field( ext4_fsblk_t, pblk ) 2219 2220 __field( char, status ) 2220 - __field( u64, seq ) 2221 2221 ), 2222 2222 2223 2223 TP_fast_assign( ··· 2230 2230 __entry->seq = EXT4_I(inode)->i_es_seq; 2231 2231 ), 2232 2232 2233 - TP_printk("dev %d,%d ino %lu es [%u/%u) mapped %llu status %s seq %llu", 2233 + TP_printk("dev %d,%d ino %llu es [%u/%u) mapped %llu status %s seq %llu", 2234 2234 MAJOR(__entry->dev), MINOR(__entry->dev), 2235 - (unsigned long) __entry->ino, 2235 + __entry->ino, 2236 2236 __entry->lblk, __entry->len, 2237 2237 __entry->pblk, show_extent_status(__entry->status), 2238 2238 __entry->seq) ··· 2256 2256 TP_ARGS(inode, lblk, len), 2257 2257 2258 2258 TP_STRUCT__entry( 2259 - __field( dev_t, dev ) 2260 - __field( ino_t, ino ) 2259 + __field( u64, ino ) 2261 2260 __field( loff_t, lblk ) 2262 2261 __field( loff_t, len ) 2263 2262 __field( u64, seq ) 2263 + __field( dev_t, dev ) 2264 2264 ), 2265 2265 2266 2266 TP_fast_assign( ··· 2271 2271 __entry->seq = EXT4_I(inode)->i_es_seq; 2272 2272 ), 2273 2273 2274 - TP_printk("dev %d,%d ino %lu es [%lld/%lld) seq %llu", 2274 + TP_printk("dev %d,%d ino %llu es [%lld/%lld) seq %llu", 2275 2275 MAJOR(__entry->dev), MINOR(__entry->dev), 2276 - (unsigned long) __entry->ino, 2276 + __entry->ino, 2277 2277 __entry->lblk, __entry->len, __entry->seq) 2278 2278 ); 2279 2279 ··· 2283 2283 TP_ARGS(inode, lblk), 2284 2284 2285 2285 TP_STRUCT__entry( 2286 + __field( u64, ino ) 2286 2287 __field( dev_t, dev ) 2287 - __field( ino_t, ino ) 2288 2288 __field( ext4_lblk_t, lblk ) 2289 2289 ), 2290 2290 ··· 2294 2294 __entry->lblk = lblk; 2295 2295 ), 2296 2296 2297 - TP_printk("dev %d,%d ino %lu lblk %u", 2297 + TP_printk("dev %d,%d ino %llu lblk %u", 2298 2298 MAJOR(__entry->dev), MINOR(__entry->dev), 2299 - (unsigned long) __entry->ino, __entry->lblk) 2299 + __entry->ino, __entry->lblk) 2300 2300 ); 2301 2301 2302 2302 TRACE_EVENT(ext4_es_find_extent_range_exit, ··· 2305 2305 TP_ARGS(inode, es), 2306 2306 2307 2307 TP_STRUCT__entry( 2308 + __field( u64, ino ) 2309 + __field( ext4_fsblk_t, pblk ) 2308 2310 __field( dev_t, dev ) 2309 - __field( ino_t, ino ) 2310 2311 __field( ext4_lblk_t, lblk ) 2311 2312 __field( ext4_lblk_t, len ) 2312 - __field( ext4_fsblk_t, pblk ) 2313 2313 __field( char, status ) 2314 2314 ), 2315 2315 ··· 2322 2322 __entry->status = ext4_es_status(es); 2323 2323 ), 2324 2324 2325 - TP_printk("dev %d,%d ino %lu es [%u/%u) mapped %llu status %s", 2325 + TP_printk("dev %d,%d ino %llu es [%u/%u) mapped %llu status %s", 2326 2326 MAJOR(__entry->dev), MINOR(__entry->dev), 2327 - (unsigned long) __entry->ino, 2327 + __entry->ino, 2328 2328 __entry->lblk, __entry->len, 2329 2329 __entry->pblk, show_extent_status(__entry->status)) 2330 2330 ); ··· 2335 2335 TP_ARGS(inode, lblk), 2336 2336 2337 2337 TP_STRUCT__entry( 2338 + __field( u64, ino ) 2338 2339 __field( dev_t, dev ) 2339 - __field( ino_t, ino ) 2340 2340 __field( ext4_lblk_t, lblk ) 2341 2341 ), 2342 2342 ··· 2346 2346 __entry->lblk = lblk; 2347 2347 ), 2348 2348 2349 - TP_printk("dev %d,%d ino %lu lblk %u", 2349 + TP_printk("dev %d,%d ino %llu lblk %u", 2350 2350 MAJOR(__entry->dev), MINOR(__entry->dev), 2351 - (unsigned long) __entry->ino, __entry->lblk) 2351 + __entry->ino, __entry->lblk) 2352 2352 ); 2353 2353 2354 2354 TRACE_EVENT(ext4_es_lookup_extent_exit, ··· 2358 2358 TP_ARGS(inode, es, found), 2359 2359 2360 2360 TP_STRUCT__entry( 2361 + __field( u64, ino ) 2362 + __field( ext4_fsblk_t, pblk ) 2361 2363 __field( dev_t, dev ) 2362 - __field( ino_t, ino ) 2363 2364 __field( ext4_lblk_t, lblk ) 2364 2365 __field( ext4_lblk_t, len ) 2365 - __field( ext4_fsblk_t, pblk ) 2366 - __field( char, status ) 2367 2366 __field( int, found ) 2367 + __field( char, status ) 2368 2368 ), 2369 2369 2370 2370 TP_fast_assign( ··· 2377 2377 __entry->found = found; 2378 2378 ), 2379 2379 2380 - TP_printk("dev %d,%d ino %lu found %d [%u/%u) %llu %s", 2380 + TP_printk("dev %d,%d ino %llu found %d [%u/%u) %llu %s", 2381 2381 MAJOR(__entry->dev), MINOR(__entry->dev), 2382 - (unsigned long) __entry->ino, __entry->found, 2382 + __entry->ino, __entry->found, 2383 2383 __entry->lblk, __entry->len, 2384 2384 __entry->found ? __entry->pblk : 0, 2385 2385 show_extent_status(__entry->found ? __entry->status : 0)) ··· 2447 2447 TP_ARGS(inode, offset, len), 2448 2448 2449 2449 TP_STRUCT__entry( 2450 - __field(dev_t, dev) 2451 - __field(ino_t, ino) 2450 + __field(u64, ino) 2452 2451 __field(loff_t, offset) 2453 2452 __field(loff_t, len) 2453 + __field(dev_t, dev) 2454 2454 ), 2455 2455 2456 2456 TP_fast_assign( ··· 2460 2460 __entry->len = len; 2461 2461 ), 2462 2462 2463 - TP_printk("dev %d,%d ino %lu offset %lld len %lld", 2463 + TP_printk("dev %d,%d ino %llu offset %lld len %lld", 2464 2464 MAJOR(__entry->dev), MINOR(__entry->dev), 2465 - (unsigned long) __entry->ino, 2465 + __entry->ino, 2466 2466 __entry->offset, __entry->len) 2467 2467 ); 2468 2468 ··· 2472 2472 TP_ARGS(inode, offset, len), 2473 2473 2474 2474 TP_STRUCT__entry( 2475 - __field(dev_t, dev) 2476 - __field(ino_t, ino) 2475 + __field(u64, ino) 2477 2476 __field(loff_t, offset) 2478 2477 __field(loff_t, len) 2478 + __field(dev_t, dev) 2479 2479 ), 2480 2480 2481 2481 TP_fast_assign( ··· 2485 2485 __entry->len = len; 2486 2486 ), 2487 2487 2488 - TP_printk("dev %d,%d ino %lu offset %lld len %lld", 2488 + TP_printk("dev %d,%d ino %llu offset %lld len %lld", 2489 2489 MAJOR(__entry->dev), MINOR(__entry->dev), 2490 - (unsigned long) __entry->ino, 2490 + __entry->ino, 2491 2491 __entry->offset, __entry->len) 2492 2492 ); 2493 2493 ··· 2526 2526 TP_ARGS(inode, es, lclu_allocated, end_allocated), 2527 2527 2528 2528 TP_STRUCT__entry( 2529 + __field( u64, ino ) 2530 + __field( u64, seq ) 2531 + __field( ext4_fsblk_t, pblk ) 2529 2532 __field( dev_t, dev ) 2530 - __field( ino_t, ino ) 2531 2533 __field( ext4_lblk_t, lblk ) 2532 2534 __field( ext4_lblk_t, len ) 2533 - __field( ext4_fsblk_t, pblk ) 2534 2535 __field( char, status ) 2535 2536 __field( bool, lclu_allocated ) 2536 2537 __field( bool, end_allocated ) 2537 - __field( u64, seq ) 2538 2538 ), 2539 2539 2540 2540 TP_fast_assign( ··· 2549 2549 __entry->seq = EXT4_I(inode)->i_es_seq; 2550 2550 ), 2551 2551 2552 - TP_printk("dev %d,%d ino %lu es [%u/%u) mapped %llu status %s allocated %d %d seq %llu", 2552 + TP_printk("dev %d,%d ino %llu es [%u/%u) mapped %llu status %s allocated %d %d seq %llu", 2553 2553 MAJOR(__entry->dev), MINOR(__entry->dev), 2554 - (unsigned long) __entry->ino, 2554 + __entry->ino, 2555 2555 __entry->lblk, __entry->len, 2556 2556 __entry->pblk, show_extent_status(__entry->status), 2557 2557 __entry->lclu_allocated, __entry->end_allocated, ··· 2875 2875 TP_ARGS(handle, inode, dentry, ret), 2876 2876 2877 2877 TP_STRUCT__entry( 2878 + __field(u64, i_ino) 2878 2879 __field(dev_t, dev) 2879 2880 __field(tid_t, t_tid) 2880 - __field(ino_t, i_ino) 2881 2881 __field(tid_t, i_sync_tid) 2882 2882 __field(int, error) 2883 2883 ), ··· 2892 2892 __entry->error = ret; 2893 2893 ), 2894 2894 2895 - TP_printk("dev %d,%d, t_tid %u, ino %lu, i_sync_tid %u, error %d", 2895 + TP_printk("dev %d,%d, t_tid %u, ino %llu, i_sync_tid %u, error %d", 2896 2896 MAJOR(__entry->dev), MINOR(__entry->dev), 2897 2897 __entry->t_tid, __entry->i_ino, __entry->i_sync_tid, 2898 2898 __entry->error ··· 2916 2916 TP_ARGS(handle, inode, ret), 2917 2917 2918 2918 TP_STRUCT__entry( 2919 + __field(u64, i_ino) 2919 2920 __field(dev_t, dev) 2920 2921 __field(tid_t, t_tid) 2921 - __field(ino_t, i_ino) 2922 2922 __field(tid_t, i_sync_tid) 2923 2923 __field(int, error) 2924 2924 ), ··· 2933 2933 __entry->error = ret; 2934 2934 ), 2935 2935 2936 - TP_printk("dev %d:%d, t_tid %u, inode %lu, i_sync_tid %u, error %d", 2936 + TP_printk("dev %d:%d, t_tid %u, inode %llu, i_sync_tid %u, error %d", 2937 2937 MAJOR(__entry->dev), MINOR(__entry->dev), 2938 2938 __entry->t_tid, __entry->i_ino, __entry->i_sync_tid, 2939 2939 __entry->error) ··· 2946 2946 TP_ARGS(handle, inode, start, end, ret), 2947 2947 2948 2948 TP_STRUCT__entry( 2949 - __field(dev_t, dev) 2950 - __field(tid_t, t_tid) 2951 - __field(ino_t, i_ino) 2952 - __field(tid_t, i_sync_tid) 2949 + __field(u64, i_ino) 2953 2950 __field(long, start) 2954 2951 __field(long, end) 2952 + __field(dev_t, dev) 2953 + __field(tid_t, t_tid) 2954 + __field(tid_t, i_sync_tid) 2955 2955 __field(int, error) 2956 2956 ), 2957 2957 ··· 2967 2967 __entry->error = ret; 2968 2968 ), 2969 2969 2970 - TP_printk("dev %d:%d, t_tid %u, inode %lu, i_sync_tid %u, error %d, start %ld, end %ld", 2970 + TP_printk("dev %d:%d, t_tid %u, inode %llu, i_sync_tid %u, error %d, start %ld, end %ld", 2971 2971 MAJOR(__entry->dev), MINOR(__entry->dev), 2972 2972 __entry->t_tid, __entry->i_ino, __entry->i_sync_tid, 2973 2973 __entry->error, __entry->start, __entry->end) ··· 3029 3029 TP_ARGS(orig_inode, orig_map, donor_inode, donor_lblk), 3030 3030 3031 3031 TP_STRUCT__entry( 3032 + __field(u64, orig_ino) 3033 + __field(u64, donor_ino) 3032 3034 __field(dev_t, dev) 3033 - __field(ino_t, orig_ino) 3034 3035 __field(ext4_lblk_t, orig_lblk) 3035 3036 __field(unsigned int, orig_flags) 3036 - __field(ino_t, donor_ino) 3037 3037 __field(ext4_lblk_t, donor_lblk) 3038 3038 __field(unsigned int, len) 3039 3039 ), ··· 3048 3048 __entry->len = orig_map->m_len; 3049 3049 ), 3050 3050 3051 - TP_printk("dev %d,%d origin ino %lu lblk %u flags %s donor ino %lu lblk %u len %u", 3051 + TP_printk("dev %d,%d origin ino %llu lblk %u flags %s donor ino %llu lblk %u len %u", 3052 3052 MAJOR(__entry->dev), MINOR(__entry->dev), 3053 - (unsigned long) __entry->orig_ino, __entry->orig_lblk, 3053 + __entry->orig_ino, __entry->orig_lblk, 3054 3054 show_mflags(__entry->orig_flags), 3055 - (unsigned long) __entry->donor_ino, __entry->donor_lblk, 3055 + __entry->donor_ino, __entry->donor_lblk, 3056 3056 __entry->len) 3057 3057 ); 3058 3058 ··· 3065 3065 move_len, move_type, ret), 3066 3066 3067 3067 TP_STRUCT__entry( 3068 + __field(u64, orig_ino) 3069 + __field(u64, donor_ino) 3070 + __field(u64, move_len) 3068 3071 __field(dev_t, dev) 3069 - __field(ino_t, orig_ino) 3070 3072 __field(ext4_lblk_t, orig_lblk) 3071 - __field(ino_t, donor_ino) 3072 3073 __field(ext4_lblk_t, donor_lblk) 3073 3074 __field(unsigned int, m_len) 3074 - __field(u64, move_len) 3075 3075 __field(int, move_type) 3076 3076 __field(int, ret) 3077 3077 ), ··· 3088 3088 __entry->ret = ret; 3089 3089 ), 3090 3090 3091 - TP_printk("dev %d,%d origin ino %lu lblk %u donor ino %lu lblk %u m_len %u, move_len %llu type %d ret %d", 3091 + TP_printk("dev %d,%d origin ino %llu lblk %u donor ino %llu lblk %u m_len %u, move_len %llu type %d ret %d", 3092 3092 MAJOR(__entry->dev), MINOR(__entry->dev), 3093 - (unsigned long) __entry->orig_ino, __entry->orig_lblk, 3094 - (unsigned long) __entry->donor_ino, __entry->donor_lblk, 3093 + __entry->orig_ino, __entry->orig_lblk, 3094 + __entry->donor_ino, __entry->donor_lblk, 3095 3095 __entry->m_len, __entry->move_len, __entry->move_type, 3096 3096 __entry->ret) 3097 3097 );