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.

f2fs: widen trace event i_ino fields to u64

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

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

authored by

Jeff Layton and committed by
Christian Brauner a232ef78 d3528714

+124 -124
+124 -124
include/trace/events/f2fs.h
··· 9 9 #include <uapi/linux/f2fs.h> 10 10 11 11 #define show_dev(dev) MAJOR(dev), MINOR(dev) 12 - #define show_dev_ino(entry) show_dev(entry->dev), (unsigned long)entry->ino 12 + #define show_dev_ino(entry) show_dev(entry->dev), (unsigned long long)entry->ino 13 13 14 14 TRACE_DEFINE_ENUM(NODE); 15 15 TRACE_DEFINE_ENUM(DATA); ··· 206 206 TP_ARGS(inode), 207 207 208 208 TP_STRUCT__entry( 209 - __field(dev_t, dev) 210 - __field(ino_t, ino) 211 - __field(ino_t, pino) 212 - __field(umode_t, mode) 209 + __field(u64, ino) 210 + __field(u64, pino) 213 211 __field(loff_t, size) 214 - __field(unsigned int, nlink) 215 212 __field(blkcnt_t, blocks) 213 + __field(dev_t, dev) 214 + __field(umode_t, mode) 215 + __field(unsigned int, nlink) 216 216 __field(__u8, advise) 217 217 ), 218 218 ··· 227 227 __entry->advise = F2FS_I(inode)->i_advise; 228 228 ), 229 229 230 - TP_printk("dev = (%d,%d), ino = %lu, pino = %lu, i_mode = 0x%hx, " 230 + TP_printk("dev = (%d,%d), ino = %llu, pino = %llu, i_mode = 0x%hx, " 231 231 "i_size = %lld, i_nlink = %u, i_blocks = %llu, i_advise = 0x%x", 232 232 show_dev_ino(__entry), 233 - (unsigned long)__entry->pino, 233 + __entry->pino, 234 234 __entry->mode, 235 235 __entry->size, 236 236 (unsigned int)__entry->nlink, ··· 245 245 TP_ARGS(inode, ret), 246 246 247 247 TP_STRUCT__entry( 248 + __field(u64, ino) 248 249 __field(dev_t, dev) 249 - __field(ino_t, ino) 250 250 __field(umode_t, mode) 251 251 __field(int, ret) 252 252 ), ··· 258 258 __entry->ret = ret; 259 259 ), 260 260 261 - TP_printk("dev = (%d,%d), ino = %lu, type: %s, mode = 0%o, ret = %d", 261 + TP_printk("dev = (%d,%d), ino = %llu, type: %s, mode = 0%o, ret = %d", 262 262 show_dev_ino(__entry), 263 263 show_inode_type(__entry->mode & S_IFMT), 264 264 __entry->mode & S_ALL_PERM, ··· 279 279 TP_ARGS(inode, cp_reason, datasync, ret), 280 280 281 281 TP_STRUCT__entry( 282 + __field(u64, ino) 282 283 __field(dev_t, dev) 283 - __field(ino_t, ino) 284 284 __field(int, cp_reason) 285 285 __field(int, datasync) 286 286 __field(int, ret) ··· 294 294 __entry->ret = ret; 295 295 ), 296 296 297 - TP_printk("dev = (%d,%d), ino = %lu, cp_reason: %s, " 297 + TP_printk("dev = (%d,%d), ino = %llu, cp_reason: %s, " 298 298 "datasync = %d, ret = %d", 299 299 show_dev_ino(__entry), 300 300 show_fsync_cpreason(__entry->cp_reason), ··· 361 361 TP_ARGS(dir, dentry), 362 362 363 363 TP_STRUCT__entry( 364 - __field(dev_t, dev) 365 - __field(ino_t, ino) 364 + __field(u64, ino) 366 365 __field(loff_t, size) 367 366 __field(blkcnt_t, blocks) 367 + __field(dev_t, dev) 368 368 __string(name, dentry->d_name.name) 369 369 ), 370 370 ··· 376 376 __assign_str(name); 377 377 ), 378 378 379 - TP_printk("dev = (%d,%d), dir ino = %lu, i_size = %lld, " 379 + TP_printk("dev = (%d,%d), dir ino = %llu, i_size = %lld, " 380 380 "i_blocks = %llu, name = %s", 381 381 show_dev_ino(__entry), 382 382 __entry->size, ··· 412 412 TP_ARGS(inode, nid, ofs, free), 413 413 414 414 TP_STRUCT__entry( 415 + __field(u64, ino) 415 416 __field(dev_t, dev) 416 - __field(ino_t, ino) 417 417 __field(nid_t, nid) 418 418 __field(unsigned int, ofs) 419 419 __field(int, free) ··· 427 427 __entry->free = free; 428 428 ), 429 429 430 - TP_printk("dev = (%d,%d), ino = %lu, nid = %u, offset = %u, freed = %d", 430 + TP_printk("dev = (%d,%d), ino = %llu, nid = %u, offset = %u, freed = %d", 431 431 show_dev_ino(__entry), 432 432 (unsigned int)__entry->nid, 433 433 __entry->ofs, ··· 441 441 TP_ARGS(inode, from), 442 442 443 443 TP_STRUCT__entry( 444 - __field(dev_t, dev) 445 - __field(ino_t, ino) 444 + __field(u64, ino) 446 445 __field(loff_t, size) 447 446 __field(blkcnt_t, blocks) 448 447 __field(u64, from) 448 + __field(dev_t, dev) 449 449 ), 450 450 451 451 TP_fast_assign( ··· 456 456 __entry->from = from; 457 457 ), 458 458 459 - TP_printk("dev = (%d,%d), ino = %lu, i_size = %lld, i_blocks = %llu, " 459 + TP_printk("dev = (%d,%d), ino = %llu, i_size = %lld, i_blocks = %llu, " 460 460 "start file offset = %llu", 461 461 show_dev_ino(__entry), 462 462 __entry->size, ··· 499 499 TP_ARGS(inode, nid, blk_addr), 500 500 501 501 TP_STRUCT__entry( 502 + __field(u64, ino) 502 503 __field(dev_t, dev) 503 - __field(ino_t, ino) 504 504 __field(nid_t, nid) 505 505 __field(block_t, blk_addr) 506 506 ), ··· 512 512 __entry->blk_addr = blk_addr; 513 513 ), 514 514 515 - TP_printk("dev = (%d,%d), ino = %lu, nid = %u, block_address = 0x%llx", 515 + TP_printk("dev = (%d,%d), ino = %llu, nid = %u, block_address = 0x%llx", 516 516 show_dev_ino(__entry), 517 517 (unsigned int)__entry->nid, 518 518 (unsigned long long)__entry->blk_addr) ··· 546 546 TP_ARGS(inode, nid, depth, err), 547 547 548 548 TP_STRUCT__entry( 549 + __field(u64, ino) 549 550 __field(dev_t, dev) 550 - __field(ino_t, ino) 551 551 __array(nid_t, nid, 3) 552 552 __field(int, depth) 553 553 __field(int, err) ··· 563 563 __entry->err = err; 564 564 ), 565 565 566 - TP_printk("dev = (%d,%d), ino = %lu, " 566 + TP_printk("dev = (%d,%d), ino = %llu, " 567 567 "nid[0] = %u, nid[1] = %u, nid[2] = %u, depth = %d, err = %d", 568 568 show_dev_ino(__entry), 569 569 (unsigned int)__entry->nid[0], ··· 581 581 TP_ARGS(inode, offset, length, ret), 582 582 583 583 TP_STRUCT__entry( 584 - __field(dev_t, dev) 585 - __field(ino_t, ino) 584 + __field(u64, ino) 586 585 __field(loff_t, offset) 587 586 __field(size_t, length) 588 587 __field(ssize_t, ret) 588 + __field(dev_t, dev) 589 589 ), 590 590 591 591 TP_fast_assign( ··· 596 596 __entry->ret = ret; 597 597 ), 598 598 599 - TP_printk("dev = (%d,%d), ino = %lu, " 599 + TP_printk("dev = (%d,%d), ino = %llu, " 600 600 "offset = %lld, length = %zu, written(err) = %zd", 601 601 show_dev_ino(__entry), 602 602 __entry->offset, ··· 611 611 TP_ARGS(inode, offset, len, advice), 612 612 613 613 TP_STRUCT__entry( 614 - __field(dev_t, dev) 615 - __field(ino_t, ino) 614 + __field(u64, ino) 616 615 __field(loff_t, size) 617 616 __field(loff_t, offset) 618 617 __field(loff_t, len) 618 + __field(dev_t, dev) 619 619 __field(int, advice) 620 620 ), 621 621 ··· 628 628 __entry->advice = advice; 629 629 ), 630 630 631 - TP_printk("dev = (%d,%d), ino = %lu, i_size = %lld offset:%llu, len:%llu, advise:%d", 631 + TP_printk("dev = (%d,%d), ino = %llu, i_size = %lld offset:%llu, len:%llu, advise:%d", 632 632 show_dev_ino(__entry), 633 633 (unsigned long long)__entry->size, 634 634 __entry->offset, ··· 643 643 TP_ARGS(inode, map, flag, ret), 644 644 645 645 TP_STRUCT__entry( 646 + __field(u64, ino) 646 647 __field(dev_t, dev) 647 - __field(ino_t, ino) 648 648 __field(block_t, m_lblk) 649 649 __field(block_t, m_pblk) 650 650 __field(unsigned int, m_len) ··· 670 670 __entry->ret = ret; 671 671 ), 672 672 673 - TP_printk("dev = (%d,%d), ino = %lu, file offset = %llu, " 673 + TP_printk("dev = (%d,%d), ino = %llu, file offset = %llu, " 674 674 "start blkaddr = 0x%llx, len = 0x%llx, flags = %u, " 675 675 "seg_type = %d, may_create = %d, multidevice = %d, " 676 676 "flag = %d, err = %d", ··· 885 885 TP_ARGS(dir, dentry, flags), 886 886 887 887 TP_STRUCT__entry( 888 + __field(u64, ino) 888 889 __field(dev_t, dev) 889 - __field(ino_t, ino) 890 890 __string(name, dentry->d_name.name) 891 891 __field(unsigned int, flags) 892 892 ), ··· 898 898 __entry->flags = flags; 899 899 ), 900 900 901 - TP_printk("dev = (%d,%d), pino = %lu, name:%s, flags:%u", 901 + TP_printk("dev = (%d,%d), pino = %llu, name:%s, flags:%u", 902 902 show_dev_ino(__entry), 903 903 __get_str(name), 904 904 __entry->flags) ··· 912 912 TP_ARGS(dir, dentry, ino, err), 913 913 914 914 TP_STRUCT__entry( 915 + __field(u64, ino) 915 916 __field(dev_t, dev) 916 - __field(ino_t, ino) 917 917 __string(name, dentry->d_name.name) 918 918 __field(nid_t, cino) 919 919 __field(int, err) ··· 927 927 __entry->err = err; 928 928 ), 929 929 930 - TP_printk("dev = (%d,%d), pino = %lu, name:%s, ino:%u, err:%d", 930 + TP_printk("dev = (%d,%d), pino = %llu, name:%s, ino:%u, err:%d", 931 931 show_dev_ino(__entry), 932 932 __get_str(name), 933 933 __entry->cino, ··· 943 943 TP_ARGS(old_dir, old_dentry, new_dir, new_dentry, flags), 944 944 945 945 TP_STRUCT__entry( 946 + __field(u64, ino) 947 + __field(u64, new_pino) 946 948 __field(dev_t, dev) 947 - __field(ino_t, ino) 948 949 __string(old_name, old_dentry->d_name.name) 949 - __field(ino_t, new_pino) 950 950 __string(new_name, new_dentry->d_name.name) 951 951 __field(unsigned int, flags) 952 952 ), ··· 960 960 __entry->flags = flags; 961 961 ), 962 962 963 - TP_printk("dev = (%d,%d), old_dir = %lu, old_name: %s, " 964 - "new_dir = %lu, new_name: %s, flags = %u", 963 + TP_printk("dev = (%d,%d), old_dir = %llu, old_name: %s, " 964 + "new_dir = %llu, new_name: %s, flags = %u", 965 965 show_dev_ino(__entry), 966 966 __get_str(old_name), 967 967 __entry->new_pino, ··· 977 977 TP_ARGS(old_dentry, new_dentry, flags, ret), 978 978 979 979 TP_STRUCT__entry( 980 + __field(u64, ino) 980 981 __field(dev_t, dev) 981 - __field(ino_t, ino) 982 982 __string(old_name, old_dentry->d_name.name) 983 983 __string(new_name, new_dentry->d_name.name) 984 984 __field(unsigned int, flags) ··· 994 994 __entry->ret = ret; 995 995 ), 996 996 997 - TP_printk("dev = (%d,%d), ino = %lu, old_name: %s, " 997 + TP_printk("dev = (%d,%d), ino = %llu, old_name: %s, " 998 998 "new_name: %s, flags = %u, ret = %d", 999 999 show_dev_ino(__entry), 1000 1000 __get_str(old_name), ··· 1010 1010 TP_ARGS(dir, start_pos, end_pos, err), 1011 1011 1012 1012 TP_STRUCT__entry( 1013 - __field(dev_t, dev) 1014 - __field(ino_t, ino) 1013 + __field(u64, ino) 1015 1014 __field(loff_t, start) 1016 1015 __field(loff_t, end) 1016 + __field(dev_t, dev) 1017 1017 __field(int, err) 1018 1018 ), 1019 1019 ··· 1025 1025 __entry->err = err; 1026 1026 ), 1027 1027 1028 - TP_printk("dev = (%d,%d), ino = %lu, start_pos:%llu, end_pos:%llu, err:%d", 1028 + TP_printk("dev = (%d,%d), ino = %llu, start_pos:%llu, end_pos:%llu, err:%d", 1029 1029 show_dev_ino(__entry), 1030 1030 __entry->start, 1031 1031 __entry->end, ··· 1040 1040 TP_ARGS(inode, mode, offset, len, ret), 1041 1041 1042 1042 TP_STRUCT__entry( 1043 - __field(dev_t, dev) 1044 - __field(ino_t, ino) 1045 - __field(int, mode) 1043 + __field(u64, ino) 1046 1044 __field(loff_t, offset) 1047 1045 __field(loff_t, len) 1048 1046 __field(loff_t, size) 1049 1047 __field(blkcnt_t, blocks) 1048 + __field(dev_t, dev) 1049 + __field(int, mode) 1050 1050 __field(int, ret) 1051 1051 ), 1052 1052 ··· 1061 1061 __entry->ret = ret; 1062 1062 ), 1063 1063 1064 - TP_printk("dev = (%d,%d), ino = %lu, mode = %x, offset = %lld, " 1064 + TP_printk("dev = (%d,%d), ino = %llu, mode = %x, offset = %lld, " 1065 1065 "len = %lld, i_size = %lld, i_blocks = %llu, ret = %d", 1066 1066 show_dev_ino(__entry), 1067 1067 __entry->mode, ··· 1079 1079 TP_ARGS(inode, iocb, len, rw), 1080 1080 1081 1081 TP_STRUCT__entry( 1082 - __field(dev_t, dev) 1083 - __field(ino_t, ino) 1082 + __field(u64, ino) 1084 1083 __field(loff_t, ki_pos) 1084 + __field(unsigned long, len) 1085 + __field(dev_t, dev) 1085 1086 __field(int, ki_flags) 1086 1087 __field(u16, ki_ioprio) 1087 - __field(unsigned long, len) 1088 1088 __field(int, rw) 1089 1089 ), 1090 1090 ··· 1098 1098 __entry->rw = rw; 1099 1099 ), 1100 1100 1101 - TP_printk("dev = (%d,%d), ino = %lu pos = %lld len = %lu ki_flags = %x ki_ioprio = %x rw = %d", 1101 + TP_printk("dev = (%d,%d), ino = %llu pos = %lld len = %lu ki_flags = %x ki_ioprio = %x rw = %d", 1102 1102 show_dev_ino(__entry), 1103 1103 __entry->ki_pos, 1104 1104 __entry->len, ··· 1115 1115 TP_ARGS(inode, offset, len, rw, ret), 1116 1116 1117 1117 TP_STRUCT__entry( 1118 - __field(dev_t, dev) 1119 - __field(ino_t, ino) 1118 + __field(u64, ino) 1120 1119 __field(loff_t, pos) 1121 1120 __field(unsigned long, len) 1121 + __field(dev_t, dev) 1122 1122 __field(int, rw) 1123 1123 __field(int, ret) 1124 1124 ), ··· 1132 1132 __entry->ret = ret; 1133 1133 ), 1134 1134 1135 - TP_printk("dev = (%d,%d), ino = %lu pos = %lld len = %lu " 1135 + TP_printk("dev = (%d,%d), ino = %llu pos = %lld len = %lu " 1136 1136 "rw = %d ret = %d", 1137 1137 show_dev_ino(__entry), 1138 1138 __entry->pos, ··· 1176 1176 TP_ARGS(folio, fio), 1177 1177 1178 1178 TP_STRUCT__entry( 1179 - __field(dev_t, dev) 1180 - __field(ino_t, ino) 1179 + __field(u64, ino) 1181 1180 __field(pgoff_t, index) 1181 + __field(dev_t, dev) 1182 1182 __field(block_t, old_blkaddr) 1183 1183 __field(block_t, new_blkaddr) 1184 1184 __field(enum req_op, op) ··· 1199 1199 __entry->type = fio->type; 1200 1200 ), 1201 1201 1202 - TP_printk("dev = (%d,%d), ino = %lu, folio_index = 0x%lx, " 1202 + TP_printk("dev = (%d,%d), ino = %llu, folio_index = 0x%lx, " 1203 1203 "oldaddr = 0x%llx, newaddr = 0x%llx, rw = %s(%s), type = %s_%s", 1204 1204 show_dev_ino(__entry), 1205 1205 (unsigned long)__entry->index, ··· 1306 1306 TP_ARGS(inode, pos, len), 1307 1307 1308 1308 TP_STRUCT__entry( 1309 - __field(dev_t, dev) 1310 - __field(ino_t, ino) 1309 + __field(u64, ino) 1311 1310 __field(loff_t, pos) 1311 + __field(dev_t, dev) 1312 1312 __field(unsigned int, len) 1313 1313 ), 1314 1314 ··· 1319 1319 __entry->len = len; 1320 1320 ), 1321 1321 1322 - TP_printk("dev = (%d,%d), ino = %lu, pos = %llu, len = %u", 1322 + TP_printk("dev = (%d,%d), ino = %llu, pos = %llu, len = %u", 1323 1323 show_dev_ino(__entry), 1324 1324 (unsigned long long)__entry->pos, 1325 1325 __entry->len) ··· 1333 1333 TP_ARGS(inode, pos, len, copied), 1334 1334 1335 1335 TP_STRUCT__entry( 1336 - __field(dev_t, dev) 1337 - __field(ino_t, ino) 1336 + __field(u64, ino) 1338 1337 __field(loff_t, pos) 1338 + __field(dev_t, dev) 1339 1339 __field(unsigned int, len) 1340 1340 __field(unsigned int, copied) 1341 1341 ), ··· 1348 1348 __entry->copied = copied; 1349 1349 ), 1350 1350 1351 - TP_printk("dev = (%d,%d), ino = %lu, pos = %llu, len = %u, copied = %u", 1351 + TP_printk("dev = (%d,%d), ino = %llu, pos = %llu, len = %u, copied = %u", 1352 1352 show_dev_ino(__entry), 1353 1353 (unsigned long long)__entry->pos, 1354 1354 __entry->len, ··· 1362 1362 TP_ARGS(folio, type), 1363 1363 1364 1364 TP_STRUCT__entry( 1365 - __field(dev_t, dev) 1366 - __field(ino_t, ino) 1367 - __field(int, type) 1368 - __field(int, dir) 1365 + __field(u64, ino) 1369 1366 __field(pgoff_t, index) 1370 1367 __field(pgoff_t, nrpages) 1368 + __field(dev_t, dev) 1369 + __field(int, type) 1370 + __field(int, dir) 1371 1371 __field(int, dirty) 1372 1372 __field(int, uptodate) 1373 1373 ), ··· 1383 1383 __entry->uptodate = folio_test_uptodate(folio); 1384 1384 ), 1385 1385 1386 - TP_printk("dev = (%d,%d), ino = %lu, %s, %s, index = %lu, nr_pages = %lu, " 1386 + TP_printk("dev = (%d,%d), ino = %llu, %s, %s, index = %lu, nr_pages = %lu, " 1387 1387 "dirty = %d, uptodate = %d", 1388 1388 show_dev_ino(__entry), 1389 1389 show_block_type(__entry->type), ··· 1437 1437 TP_ARGS(inode, cow_inode, index, old_addr, new_addr, recovery), 1438 1438 1439 1439 TP_STRUCT__entry( 1440 - __field(dev_t, dev) 1441 - __field(ino_t, ino) 1442 - __field(ino_t, cow_ino) 1440 + __field(u64, ino) 1441 + __field(u64, cow_ino) 1443 1442 __field(pgoff_t, index) 1443 + __field(dev_t, dev) 1444 1444 __field(block_t, old_addr) 1445 1445 __field(block_t, new_addr) 1446 1446 __field(bool, recovery) ··· 1456 1456 __entry->recovery = recovery; 1457 1457 ), 1458 1458 1459 - TP_printk("dev = (%d,%d), ino = %lu, cow_ino = %lu, index = %lu, " 1459 + TP_printk("dev = (%d,%d), ino = %llu, cow_ino = %llu, index = %lu, " 1460 1460 "old_addr = 0x%llx, new_addr = 0x%llx, recovery = %d", 1461 1461 show_dev_ino(__entry), 1462 1462 __entry->cow_ino, ··· 1474 1474 TP_ARGS(inode, index, flags, ret), 1475 1475 1476 1476 TP_STRUCT__entry( 1477 - __field(dev_t, dev) 1478 - __field(ino_t, ino) 1477 + __field(u64, ino) 1479 1478 __field(pgoff_t, index) 1480 1479 __field(vm_flags_t, flags) 1480 + __field(dev_t, dev) 1481 1481 __field(vm_fault_t, ret) 1482 1482 ), 1483 1483 ··· 1489 1489 __entry->ret = ret; 1490 1490 ), 1491 1491 1492 - TP_printk("dev = (%d,%d), ino = %lu, index = %lu, flags: %s, ret: %s", 1492 + TP_printk("dev = (%d,%d), ino = %llu, index = %lu, flags: %s, ret: %s", 1493 1493 show_dev_ino(__entry), 1494 1494 (unsigned long)__entry->index, 1495 1495 __print_flags(__entry->flags, "|", FAULT_FLAG_TRACE), ··· 1519 1519 TP_ARGS(inode, wbc, type), 1520 1520 1521 1521 TP_STRUCT__entry( 1522 - __field(dev_t, dev) 1523 - __field(ino_t, ino) 1524 - __field(int, type) 1525 - __field(int, dir) 1526 - __field(long, nr_to_write) 1527 - __field(long, pages_skipped) 1522 + __field(u64, ino) 1528 1523 __field(loff_t, range_start) 1529 1524 __field(loff_t, range_end) 1525 + __field(long, nr_to_write) 1526 + __field(long, pages_skipped) 1530 1527 __field(pgoff_t, writeback_index) 1528 + __field(dev_t, dev) 1529 + __field(int, type) 1530 + __field(int, dir) 1531 1531 __field(int, sync_mode) 1532 1532 __field(char, for_kupdate) 1533 1533 __field(char, for_background) ··· 1554 1554 __entry->for_sync = wbc->for_sync; 1555 1555 ), 1556 1556 1557 - TP_printk("dev = (%d,%d), ino = %lu, %s, %s, nr_to_write %ld, " 1557 + TP_printk("dev = (%d,%d), ino = %llu, %s, %s, nr_to_write %ld, " 1558 1558 "skipped %ld, start %lld, end %lld, wb_idx %lu, sync_mode %d, " 1559 1559 "kupdate %u background %u tagged %u cyclic %u sync %u", 1560 1560 show_dev_ino(__entry), ··· 1580 1580 TP_ARGS(inode, start, nrpage), 1581 1581 1582 1582 TP_STRUCT__entry( 1583 - __field(dev_t, dev) 1584 - __field(ino_t, ino) 1583 + __field(u64, ino) 1585 1584 __field(pgoff_t, start) 1585 + __field(dev_t, dev) 1586 1586 __field(unsigned int, nrpage) 1587 1587 ), 1588 1588 ··· 1593 1593 __entry->nrpage = nrpage; 1594 1594 ), 1595 1595 1596 - TP_printk("dev = (%d,%d), ino = %lu, start = %lu nrpage = %u", 1596 + TP_printk("dev = (%d,%d), ino = %llu, start = %lu nrpage = %u", 1597 1597 show_dev_ino(__entry), 1598 1598 (unsigned long)__entry->start, 1599 1599 __entry->nrpage) ··· 1738 1738 TP_ARGS(inode, pgofs, type), 1739 1739 1740 1740 TP_STRUCT__entry( 1741 + __field(u64, ino) 1741 1742 __field(dev_t, dev) 1742 - __field(ino_t, ino) 1743 1743 __field(unsigned int, pgofs) 1744 1744 __field(enum extent_type, type) 1745 1745 ), ··· 1751 1751 __entry->type = type; 1752 1752 ), 1753 1753 1754 - TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, type = %s", 1754 + TP_printk("dev = (%d,%d), ino = %llu, pgofs = %u, type = %s", 1755 1755 show_dev_ino(__entry), 1756 1756 __entry->pgofs, 1757 1757 show_extent_type(__entry->type)) ··· 1767 1767 TP_CONDITION(ei), 1768 1768 1769 1769 TP_STRUCT__entry( 1770 + __field(u64, ino) 1770 1771 __field(dev_t, dev) 1771 - __field(ino_t, ino) 1772 1772 __field(unsigned int, pgofs) 1773 1773 __field(unsigned int, fofs) 1774 1774 __field(unsigned int, len) ··· 1784 1784 __entry->blk = ei->blk; 1785 1785 ), 1786 1786 1787 - TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, " 1787 + TP_printk("dev = (%d,%d), ino = %llu, pgofs = %u, " 1788 1788 "read_ext_info(fofs: %u, len: %u, blk: %u)", 1789 1789 show_dev_ino(__entry), 1790 1790 __entry->pgofs, ··· 1803 1803 TP_CONDITION(ei), 1804 1804 1805 1805 TP_STRUCT__entry( 1806 + __field(u64, ino) 1807 + __field(unsigned long long, age) 1808 + __field(unsigned long long, blocks) 1806 1809 __field(dev_t, dev) 1807 - __field(ino_t, ino) 1808 1810 __field(unsigned int, pgofs) 1809 1811 __field(unsigned int, fofs) 1810 1812 __field(unsigned int, len) 1811 - __field(unsigned long long, age) 1812 - __field(unsigned long long, blocks) 1813 1813 ), 1814 1814 1815 1815 TP_fast_assign( ··· 1822 1822 __entry->blocks = ei->last_blocks; 1823 1823 ), 1824 1824 1825 - TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, " 1825 + TP_printk("dev = (%d,%d), ino = %llu, pgofs = %u, " 1826 1826 "age_ext_info(fofs: %u, len: %u, age: %llu, blocks: %llu)", 1827 1827 show_dev_ino(__entry), 1828 1828 __entry->pgofs, ··· 1841 1841 TP_ARGS(inode, pgofs, len, blkaddr, c_len), 1842 1842 1843 1843 TP_STRUCT__entry( 1844 + __field(u64, ino) 1844 1845 __field(dev_t, dev) 1845 - __field(ino_t, ino) 1846 1846 __field(unsigned int, pgofs) 1847 1847 __field(u32, blk) 1848 1848 __field(unsigned int, len) ··· 1858 1858 __entry->c_len = c_len; 1859 1859 ), 1860 1860 1861 - TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, " 1861 + TP_printk("dev = (%d,%d), ino = %llu, pgofs = %u, " 1862 1862 "len = %u, blkaddr = %u, c_len = %u", 1863 1863 show_dev_ino(__entry), 1864 1864 __entry->pgofs, ··· 1876 1876 TP_ARGS(inode, pgofs, len, age, last_blks), 1877 1877 1878 1878 TP_STRUCT__entry( 1879 - __field(dev_t, dev) 1880 - __field(ino_t, ino) 1881 - __field(unsigned int, pgofs) 1882 - __field(unsigned int, len) 1879 + __field(u64, ino) 1883 1880 __field(unsigned long long, age) 1884 1881 __field(unsigned long long, blocks) 1882 + __field(dev_t, dev) 1883 + __field(unsigned int, pgofs) 1884 + __field(unsigned int, len) 1885 1885 ), 1886 1886 1887 1887 TP_fast_assign( ··· 1893 1893 __entry->blocks = last_blks; 1894 1894 ), 1895 1895 1896 - TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, " 1896 + TP_printk("dev = (%d,%d), ino = %llu, pgofs = %u, " 1897 1897 "len = %u, age = %llu, blocks = %llu", 1898 1898 show_dev_ino(__entry), 1899 1899 __entry->pgofs, ··· 1938 1938 TP_ARGS(inode, node_cnt, type), 1939 1939 1940 1940 TP_STRUCT__entry( 1941 + __field(u64, ino) 1941 1942 __field(dev_t, dev) 1942 - __field(ino_t, ino) 1943 1943 __field(unsigned int, node_cnt) 1944 1944 __field(enum extent_type, type) 1945 1945 ), ··· 1951 1951 __entry->type = type; 1952 1952 ), 1953 1953 1954 - TP_printk("dev = (%d,%d), ino = %lu, destroyed: node_cnt = %u, type = %s", 1954 + TP_printk("dev = (%d,%d), ino = %llu, destroyed: node_cnt = %u, type = %s", 1955 1955 show_dev_ino(__entry), 1956 1956 __entry->node_cnt, 1957 1957 show_extent_type(__entry->type)) ··· 2027 2027 TP_ARGS(inode, cluster_idx, cluster_size, algtype), 2028 2028 2029 2029 TP_STRUCT__entry( 2030 - __field(dev_t, dev) 2031 - __field(ino_t, ino) 2030 + __field(u64, ino) 2032 2031 __field(pgoff_t, idx) 2032 + __field(dev_t, dev) 2033 2033 __field(unsigned int, size) 2034 2034 __field(unsigned int, algtype) 2035 2035 ), ··· 2042 2042 __entry->algtype = algtype; 2043 2043 ), 2044 2044 2045 - TP_printk("dev = (%d,%d), ino = %lu, cluster_idx:%lu, " 2045 + TP_printk("dev = (%d,%d), ino = %llu, cluster_idx:%lu, " 2046 2046 "cluster_size = %u, algorithm = %s", 2047 2047 show_dev_ino(__entry), 2048 2048 __entry->idx, ··· 2058 2058 TP_ARGS(inode, cluster_idx, compressed_size, ret), 2059 2059 2060 2060 TP_STRUCT__entry( 2061 - __field(dev_t, dev) 2062 - __field(ino_t, ino) 2061 + __field(u64, ino) 2063 2062 __field(pgoff_t, idx) 2063 + __field(dev_t, dev) 2064 2064 __field(unsigned int, size) 2065 2065 __field(unsigned int, ret) 2066 2066 ), ··· 2073 2073 __entry->ret = ret; 2074 2074 ), 2075 2075 2076 - TP_printk("dev = (%d,%d), ino = %lu, cluster_idx:%lu, " 2076 + TP_printk("dev = (%d,%d), ino = %llu, cluster_idx:%lu, " 2077 2077 "compressed_size = %u, ret = %d", 2078 2078 show_dev_ino(__entry), 2079 2079 __entry->idx, ··· 2311 2311 TP_ARGS(inode, lblock, pblock), 2312 2312 2313 2313 TP_STRUCT__entry( 2314 - __field(dev_t, dev) 2315 - __field(ino_t, ino) 2314 + __field(u64, ino) 2316 2315 __field(sector_t, lblock) 2317 2316 __field(sector_t, pblock) 2317 + __field(dev_t, dev) 2318 2318 ), 2319 2319 2320 2320 TP_fast_assign( ··· 2324 2324 __entry->pblock = pblock; 2325 2325 ), 2326 2326 2327 - TP_printk("dev = (%d,%d), ino = %lu, lblock:%lld, pblock:%lld", 2327 + TP_printk("dev = (%d,%d), ino = %llu, lblock:%lld, pblock:%lld", 2328 2328 show_dev_ino(__entry), 2329 2329 (unsigned long long)__entry->lblock, 2330 2330 (unsigned long long)__entry->pblock) ··· 2338 2338 TP_ARGS(inode, lblock, pblock, len, flags, ret), 2339 2339 2340 2340 TP_STRUCT__entry( 2341 - __field(dev_t, dev) 2342 - __field(ino_t, ino) 2341 + __field(u64, ino) 2343 2342 __field(sector_t, lblock) 2344 2343 __field(sector_t, pblock) 2345 2344 __field(unsigned long long, len) 2345 + __field(dev_t, dev) 2346 2346 __field(unsigned int, flags) 2347 2347 __field(int, ret) 2348 2348 ), ··· 2357 2357 __entry->ret = ret; 2358 2358 ), 2359 2359 2360 - TP_printk("dev = (%d,%d), ino = %lu, lblock:%lld, pblock:%lld, " 2360 + TP_printk("dev = (%d,%d), ino = %llu, lblock:%lld, pblock:%lld, " 2361 2361 "len:%llu, flags:%u, ret:%d", 2362 2362 show_dev_ino(__entry), 2363 2363 (unsigned long long)__entry->lblock, ··· 2375 2375 TP_ARGS(inode, offset, bytes, pid, pathname, command), 2376 2376 2377 2377 TP_STRUCT__entry( 2378 - __string(pathbuf, pathname) 2378 + __field(u64, ino) 2379 2379 __field(loff_t, offset) 2380 - __field(int, bytes) 2381 2380 __field(loff_t, i_size) 2381 + __string(pathbuf, pathname) 2382 2382 __string(cmdline, command) 2383 2383 __field(pid_t, pid) 2384 - __field(ino_t, ino) 2384 + __field(int, bytes) 2385 2385 ), 2386 2386 2387 2387 TP_fast_assign( ··· 2402 2402 ), 2403 2403 2404 2404 TP_printk("entry_name %s, offset %llu, bytes %d, cmdline %s," 2405 - " pid %d, i_size %llu, ino %lu", 2405 + " pid %d, i_size %llu, ino %llu", 2406 2406 __get_str(pathbuf), __entry->offset, __entry->bytes, 2407 2407 __get_str(cmdline), __entry->pid, __entry->i_size, 2408 - (unsigned long) __entry->ino) 2408 + __entry->ino) 2409 2409 ); 2410 2410 2411 2411 DECLARE_EVENT_CLASS(f2fs__rw_end, ··· 2415 2415 TP_ARGS(inode, offset, bytes), 2416 2416 2417 2417 TP_STRUCT__entry( 2418 - __field(ino_t, ino) 2418 + __field(u64, ino) 2419 2419 __field(loff_t, offset) 2420 2420 __field(int, bytes) 2421 2421 ), ··· 2426 2426 __entry->bytes = bytes; 2427 2427 ), 2428 2428 2429 - TP_printk("ino %lu, offset %llu, bytes %d", 2430 - (unsigned long) __entry->ino, 2429 + TP_printk("ino %llu, offset %llu, bytes %d", 2430 + __entry->ino, 2431 2431 __entry->offset, __entry->bytes) 2432 2432 ); 2433 2433