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

NFS: Improve readpage/writepage tracing

Switch formatting to better match that used by other NFS tracepoints.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

Trond Myklebust 3fa5cbdc b313eb91

+26 -28
+26 -28
fs/nfs/nfstrace.h
··· 1137 1137 __field(u32, arg_count) 1138 1138 __field(u32, res_count) 1139 1139 __field(bool, eof) 1140 - __field(int, status) 1140 + __field(int, error) 1141 1141 ), 1142 1142 1143 1143 TP_fast_assign( ··· 1146 1146 const struct nfs_fh *fh = hdr->args.fh ? 1147 1147 hdr->args.fh : &nfsi->fh; 1148 1148 1149 - __entry->status = task->tk_status; 1149 + __entry->error = task->tk_status; 1150 1150 __entry->offset = hdr->args.offset; 1151 1151 __entry->arg_count = hdr->args.count; 1152 1152 __entry->res_count = hdr->res.count; ··· 1157 1157 ), 1158 1158 1159 1159 TP_printk( 1160 - "fileid=%02x:%02x:%llu fhandle=0x%08x " 1161 - "offset=%lld count=%u res=%u status=%d%s", 1160 + "error=%d fileid=%02x:%02x:%llu fhandle=0x%08x " 1161 + "offset=%lld count=%u res=%u%s", __entry->error, 1162 1162 MAJOR(__entry->dev), MINOR(__entry->dev), 1163 1163 (unsigned long long)__entry->fileid, 1164 1164 __entry->fhandle, 1165 1165 (long long)__entry->offset, __entry->arg_count, 1166 - __entry->res_count, __entry->status, 1167 - __entry->eof ? " eof" : "" 1166 + __entry->res_count, __entry->eof ? " eof" : "" 1168 1167 ) 1169 1168 ); 1170 1169 ··· 1183 1184 __field(u32, arg_count) 1184 1185 __field(u32, res_count) 1185 1186 __field(bool, eof) 1186 - __field(int, status) 1187 + __field(int, error) 1187 1188 ), 1188 1189 1189 1190 TP_fast_assign( ··· 1192 1193 const struct nfs_fh *fh = hdr->args.fh ? 1193 1194 hdr->args.fh : &nfsi->fh; 1194 1195 1195 - __entry->status = task->tk_status; 1196 + __entry->error = task->tk_status; 1196 1197 __entry->offset = hdr->args.offset; 1197 1198 __entry->arg_count = hdr->args.count; 1198 1199 __entry->res_count = hdr->res.count; ··· 1203 1204 ), 1204 1205 1205 1206 TP_printk( 1206 - "fileid=%02x:%02x:%llu fhandle=0x%08x " 1207 - "offset=%lld count=%u res=%u status=%d%s", 1207 + "error=%d fileid=%02x:%02x:%llu fhandle=0x%08x " 1208 + "offset=%lld count=%u res=%u%s", __entry->error, 1208 1209 MAJOR(__entry->dev), MINOR(__entry->dev), 1209 1210 (unsigned long long)__entry->fileid, 1210 1211 __entry->fhandle, 1211 1212 (long long)__entry->offset, __entry->arg_count, 1212 - __entry->res_count, __entry->status, 1213 - __entry->eof ? " eof" : "" 1213 + __entry->res_count, __entry->eof ? " eof" : "" 1214 1214 ) 1215 1215 ); 1216 1216 ··· 1321 1323 __field(u32, arg_count) 1322 1324 __field(u32, res_count) 1323 1325 __field(loff_t, pos) 1324 - __field(int, status) 1326 + __field(int, error) 1325 1327 ), 1326 1328 1327 1329 TP_fast_assign( ··· 1330 1332 const struct nfs_fh *fh = hdr->args.fh ? 1331 1333 hdr->args.fh : &nfsi->fh; 1332 1334 1333 - __entry->status = error; 1335 + __entry->error = error; 1334 1336 __entry->offset = hdr->args.offset; 1335 1337 __entry->arg_count = hdr->args.count; 1336 1338 __entry->res_count = hdr->res.count; ··· 1339 1341 __entry->fhandle = nfs_fhandle_hash(fh); 1340 1342 ), 1341 1343 1342 - TP_printk("fileid=%02x:%02x:%llu fhandle=0x%08x " 1343 - "offset=%lld count=%u res=%u pos=%llu status=%d", 1344 + TP_printk("error=%d fileid=%02x:%02x:%llu fhandle=0x%08x " 1345 + "offset=%lld count=%u res=%u pos=%llu", __entry->error, 1344 1346 MAJOR(__entry->dev), MINOR(__entry->dev), 1345 1347 (unsigned long long)__entry->fileid, __entry->fhandle, 1346 1348 (long long)__entry->offset, __entry->arg_count, __entry->res_count, 1347 - __entry->pos, __entry->status 1349 + __entry->pos 1348 1350 ) 1349 1351 ); 1350 1352 ··· 1404 1406 __field(loff_t, offset) 1405 1407 __field(u32, arg_count) 1406 1408 __field(u32, res_count) 1407 - __field(int, status) 1409 + __field(int, error) 1408 1410 __field(unsigned long, stable) 1409 1411 __array(char, verifier, NFS4_VERIFIER_SIZE) 1410 1412 ), ··· 1416 1418 hdr->args.fh : &nfsi->fh; 1417 1419 const struct nfs_writeverf *verf = hdr->res.verf; 1418 1420 1419 - __entry->status = task->tk_status; 1421 + __entry->error = task->tk_status; 1420 1422 __entry->offset = hdr->args.offset; 1421 1423 __entry->arg_count = hdr->args.count; 1422 1424 __entry->res_count = hdr->res.count; ··· 1430 1432 ), 1431 1433 1432 1434 TP_printk( 1433 - "fileid=%02x:%02x:%llu fhandle=0x%08x " 1434 - "offset=%lld count=%u res=%u status=%d stable=%s " 1435 - "verifier=%s", 1435 + "error=%d fileid=%02x:%02x:%llu fhandle=0x%08x " 1436 + "offset=%lld count=%u res=%u stable=%s " 1437 + "verifier=%s", __entry->error, 1436 1438 MAJOR(__entry->dev), MINOR(__entry->dev), 1437 1439 (unsigned long long)__entry->fileid, 1438 1440 __entry->fhandle, 1439 1441 (long long)__entry->offset, __entry->arg_count, 1440 - __entry->res_count, __entry->status, 1442 + __entry->res_count, 1441 1443 show_nfs_stable_how(__entry->stable), 1442 1444 show_nfs4_verifier(__entry->verifier) 1443 1445 ) ··· 1545 1547 __field(u32, fhandle) 1546 1548 __field(u64, fileid) 1547 1549 __field(loff_t, offset) 1548 - __field(int, status) 1550 + __field(int, error) 1549 1551 __field(unsigned long, stable) 1550 1552 __array(char, verifier, NFS4_VERIFIER_SIZE) 1551 1553 ), ··· 1557 1559 data->args.fh : &nfsi->fh; 1558 1560 const struct nfs_writeverf *verf = data->res.verf; 1559 1561 1560 - __entry->status = task->tk_status; 1562 + __entry->error = task->tk_status; 1561 1563 __entry->offset = data->args.offset; 1562 1564 __entry->stable = verf->committed; 1563 1565 memcpy(__entry->verifier, ··· 1569 1571 ), 1570 1572 1571 1573 TP_printk( 1572 - "fileid=%02x:%02x:%llu fhandle=0x%08x " 1573 - "offset=%lld status=%d stable=%s verifier=%s", 1574 + "error=%d fileid=%02x:%02x:%llu fhandle=0x%08x " 1575 + "offset=%lld stable=%s verifier=%s", __entry->error, 1574 1576 MAJOR(__entry->dev), MINOR(__entry->dev), 1575 1577 (unsigned long long)__entry->fileid, 1576 1578 __entry->fhandle, 1577 - (long long)__entry->offset, __entry->status, 1579 + (long long)__entry->offset, 1578 1580 show_nfs_stable_how(__entry->stable), 1579 1581 show_nfs4_verifier(__entry->verifier) 1580 1582 )