Add a tracepoint to log calls to afs_make_call(), including the destination server address.
Unified · Split
| @@ -290,6 +290,7 @@ void afs_fs_fetch_status(struct afs_operation *op) · 289 unmodified lines | |||
| 290 | bp[2] = htonl(vp->fid.vnode); | 290 | bp[2] = htonl(vp->fid.vnode); |
| 291 | bp[3] = htonl(vp->fid.unique); | 291 | bp[3] = htonl(vp->fid.unique); |
| 292 | 292 | ||
| 293 | call->fid = vp->fid; | ||
| 293 | trace_afs_make_fs_call(call, &vp->fid); | 294 | trace_afs_make_fs_call(call, &vp->fid); |
| 294 | afs_make_op_call(op, call, GFP_NOFS); | 295 | afs_make_op_call(op, call, GFP_NOFS); |
| 295 | } | 296 | } |
| @@ -442,6 +443,7 @@ static void afs_fs_fetch_data64(struct afs_operation *op) · 146 unmodified lines | |||
| 442 | bp[6] = 0; | 443 | bp[6] = 0; |
| 443 | bp[7] = htonl(lower_32_bits(req->len)); | 444 | bp[7] = htonl(lower_32_bits(req->len)); |
| 444 | 445 | ||
| 446 | call->fid = vp->fid; | ||
| 445 | trace_afs_make_fs_call(call, &vp->fid); | 447 | trace_afs_make_fs_call(call, &vp->fid); |
| 446 | afs_make_op_call(op, call, GFP_NOFS); | 448 | afs_make_op_call(op, call, GFP_NOFS); |
| 447 | } | 449 | } |
| @@ -476,6 +478,7 @@ void afs_fs_fetch_data(struct afs_operation *op) · 28 unmodified lines | |||
| 476 | bp[4] = htonl(lower_32_bits(req->pos)); | 478 | bp[4] = htonl(lower_32_bits(req->pos)); |
| 477 | bp[5] = htonl(lower_32_bits(req->len)); | 479 | bp[5] = htonl(lower_32_bits(req->len)); |
| 478 | 480 | ||
| 481 | call->fid = vp->fid; | ||
| 479 | trace_afs_make_fs_call(call, &vp->fid); | 482 | trace_afs_make_fs_call(call, &vp->fid); |
| 480 | afs_make_op_call(op, call, GFP_NOFS); | 483 | afs_make_op_call(op, call, GFP_NOFS); |
| 481 | } | 484 | } |
| @@ -559,6 +562,7 @@ void afs_fs_create_file(struct afs_operation *op) · 77 unmodified lines | |||
| 559 | *bp++ = htonl(op->create.mode & S_IALLUGO); /* unix mode */ | 562 | *bp++ = htonl(op->create.mode & S_IALLUGO); /* unix mode */ |
| 560 | *bp++ = 0; /* segment size */ | 563 | *bp++ = 0; /* segment size */ |
| 561 | 564 | ||
| 565 | call->fid = dvp->fid; | ||
| 562 | trace_afs_make_fs_call1(call, &dvp->fid, name); | 566 | trace_afs_make_fs_call1(call, &dvp->fid, name); |
| 563 | afs_make_op_call(op, call, GFP_NOFS); | 567 | afs_make_op_call(op, call, GFP_NOFS); |
| 564 | } | 568 | } |
| @@ -612,6 +616,7 @@ void afs_fs_make_dir(struct afs_operation *op) · 47 unmodified lines | |||
| 612 | *bp++ = htonl(op->create.mode & S_IALLUGO); /* unix mode */ | 616 | *bp++ = htonl(op->create.mode & S_IALLUGO); /* unix mode */ |
| 613 | *bp++ = 0; /* segment size */ | 617 | *bp++ = 0; /* segment size */ |
| 614 | 618 | ||
| 619 | call->fid = dvp->fid; | ||
| 615 | trace_afs_make_fs_call1(call, &dvp->fid, name); | 620 | trace_afs_make_fs_call1(call, &dvp->fid, name); |
| 616 | afs_make_op_call(op, call, GFP_NOFS); | 621 | afs_make_op_call(op, call, GFP_NOFS); |
| 617 | } | 622 | } |
| @@ -685,6 +690,7 @@ void afs_fs_remove_file(struct afs_operation *op) · 67 unmodified lines | |||
| 685 | bp = (void *) bp + padsz; | 690 | bp = (void *) bp + padsz; |
| 686 | } | 691 | } |
| 687 | 692 | ||
| 693 | call->fid = dvp->fid; | ||
| 688 | trace_afs_make_fs_call1(call, &dvp->fid, name); | 694 | trace_afs_make_fs_call1(call, &dvp->fid, name); |
| 689 | afs_make_op_call(op, call, GFP_NOFS); | 695 | afs_make_op_call(op, call, GFP_NOFS); |
| 690 | } | 696 | } |
| @@ -732,6 +738,7 @@ void afs_fs_remove_dir(struct afs_operation *op) · 41 unmodified lines | |||
| 732 | bp = (void *) bp + padsz; | 738 | bp = (void *) bp + padsz; |
| 733 | } | 739 | } |
| 734 | 740 | ||
| 741 | call->fid = dvp->fid; | ||
| 735 | trace_afs_make_fs_call1(call, &dvp->fid, name); | 742 | trace_afs_make_fs_call1(call, &dvp->fid, name); |
| 736 | afs_make_op_call(op, call, GFP_NOFS); | 743 | afs_make_op_call(op, call, GFP_NOFS); |
| 737 | } | 744 | } |
| @@ -812,6 +819,7 @@ void afs_fs_link(struct afs_operation *op) · 74 unmodified lines | |||
| 812 | *bp++ = htonl(vp->fid.vnode); | 819 | *bp++ = htonl(vp->fid.vnode); |
| 813 | *bp++ = htonl(vp->fid.unique); | 820 | *bp++ = htonl(vp->fid.unique); |
| 814 | 821 | ||
| 822 | call->fid = vp->fid; | ||
| 815 | trace_afs_make_fs_call1(call, &vp->fid, name); | 823 | trace_afs_make_fs_call1(call, &vp->fid, name); |
| 816 | afs_make_op_call(op, call, GFP_NOFS); | 824 | afs_make_op_call(op, call, GFP_NOFS); |
| 817 | } | 825 | } |
| @@ -907,6 +915,7 @@ void afs_fs_symlink(struct afs_operation *op) · 89 unmodified lines | |||
| 907 | *bp++ = htonl(S_IRWXUGO); /* unix mode */ | 915 | *bp++ = htonl(S_IRWXUGO); /* unix mode */ |
| 908 | *bp++ = 0; /* segment size */ | 916 | *bp++ = 0; /* segment size */ |
| 909 | 917 | ||
| 918 | call->fid = dvp->fid; | ||
| 910 | trace_afs_make_fs_call1(call, &dvp->fid, name); | 919 | trace_afs_make_fs_call1(call, &dvp->fid, name); |
| 911 | afs_make_op_call(op, call, GFP_NOFS); | 920 | afs_make_op_call(op, call, GFP_NOFS); |
| 912 | } | 921 | } |
| @@ -1003,6 +1012,7 @@ void afs_fs_rename(struct afs_operation *op) · 90 unmodified lines | |||
| 1003 | bp = (void *) bp + n_padsz; | 1012 | bp = (void *) bp + n_padsz; |
| 1004 | } | 1013 | } |
| 1005 | 1014 | ||
| 1015 | call->fid = orig_dvp->fid; | ||
| 1006 | trace_afs_make_fs_call2(call, &orig_dvp->fid, orig_name, new_name); | 1016 | trace_afs_make_fs_call2(call, &orig_dvp->fid, orig_name, new_name); |
| 1007 | afs_make_op_call(op, call, GFP_NOFS); | 1017 | afs_make_op_call(op, call, GFP_NOFS); |
| 1008 | } | 1018 | } |
| @@ -1090,6 +1100,7 @@ static void afs_fs_store_data64(struct afs_operation *op) · 81 unmodified lines | |||
| 1090 | *bp++ = htonl(upper_32_bits(op->store.i_size)); | 1100 | *bp++ = htonl(upper_32_bits(op->store.i_size)); |
| 1091 | *bp++ = htonl(lower_32_bits(op->store.i_size)); | 1101 | *bp++ = htonl(lower_32_bits(op->store.i_size)); |
| 1092 | 1102 | ||
| 1103 | call->fid = vp->fid; | ||
| 1093 | trace_afs_make_fs_call(call, &vp->fid); | 1104 | trace_afs_make_fs_call(call, &vp->fid); |
| 1094 | afs_make_op_call(op, call, GFP_NOFS); | 1105 | afs_make_op_call(op, call, GFP_NOFS); |
| 1095 | } | 1106 | } |
| @@ -1140,6 +1151,7 @@ void afs_fs_store_data(struct afs_operation *op) · 44 unmodified lines | |||
| 1140 | *bp++ = htonl(lower_32_bits(op->store.size)); | 1151 | *bp++ = htonl(lower_32_bits(op->store.size)); |
| 1141 | *bp++ = htonl(lower_32_bits(op->store.i_size)); | 1152 | *bp++ = htonl(lower_32_bits(op->store.i_size)); |
| 1142 | 1153 | ||
| 1154 | call->fid = vp->fid; | ||
| 1143 | trace_afs_make_fs_call(call, &vp->fid); | 1155 | trace_afs_make_fs_call(call, &vp->fid); |
| 1144 | afs_make_op_call(op, call, GFP_NOFS); | 1156 | afs_make_op_call(op, call, GFP_NOFS); |
| 1145 | } | 1157 | } |
| @@ -1206,6 +1218,7 @@ static void afs_fs_setattr_size64(struct afs_operation *op) · 60 unmodified lines | |||
| 1206 | *bp++ = htonl(upper_32_bits(attr->ia_size)); /* new file length */ | 1218 | *bp++ = htonl(upper_32_bits(attr->ia_size)); /* new file length */ |
| 1207 | *bp++ = htonl(lower_32_bits(attr->ia_size)); | 1219 | *bp++ = htonl(lower_32_bits(attr->ia_size)); |
| 1208 | 1220 | ||
| 1221 | call->fid = vp->fid; | ||
| 1209 | trace_afs_make_fs_call(call, &vp->fid); | 1222 | trace_afs_make_fs_call(call, &vp->fid); |
| 1210 | afs_make_op_call(op, call, GFP_NOFS); | 1223 | afs_make_op_call(op, call, GFP_NOFS); |
| 1211 | } | 1224 | } |
| @@ -1247,6 +1260,7 @@ static void afs_fs_setattr_size(struct afs_operation *op) · 35 unmodified lines | |||
| 1247 | *bp++ = 0; /* size of write */ | 1260 | *bp++ = 0; /* size of write */ |
| 1248 | *bp++ = htonl(attr->ia_size); /* new file length */ | 1261 | *bp++ = htonl(attr->ia_size); /* new file length */ |
| 1249 | 1262 | ||
| 1263 | call->fid = vp->fid; | ||
| 1250 | trace_afs_make_fs_call(call, &vp->fid); | 1264 | trace_afs_make_fs_call(call, &vp->fid); |
| 1251 | afs_make_op_call(op, call, GFP_NOFS); | 1265 | afs_make_op_call(op, call, GFP_NOFS); |
| 1252 | } | 1266 | } |
| @@ -1283,6 +1297,7 @@ void afs_fs_setattr(struct afs_operation *op) · 30 unmodified lines | |||
| 1283 | 1297 | ||
| 1284 | xdr_encode_AFS_StoreStatus(&bp, op->setattr.attr); | 1298 | xdr_encode_AFS_StoreStatus(&bp, op->setattr.attr); |
| 1285 | 1299 | ||
| 1300 | call->fid = vp->fid; | ||
| 1286 | trace_afs_make_fs_call(call, &vp->fid); | 1301 | trace_afs_make_fs_call(call, &vp->fid); |
| 1287 | afs_make_op_call(op, call, GFP_NOFS); | 1302 | afs_make_op_call(op, call, GFP_NOFS); |
| 1288 | } | 1303 | } |
| @@ -1446,6 +1461,7 @@ void afs_fs_get_volume_status(struct afs_operation *op) · 157 unmodified lines | |||
| 1446 | bp[0] = htonl(FSGETVOLUMESTATUS); | 1461 | bp[0] = htonl(FSGETVOLUMESTATUS); |
| 1447 | bp[1] = htonl(vp->fid.vid); | 1462 | bp[1] = htonl(vp->fid.vid); |
| 1448 | 1463 | ||
| 1464 | call->fid = vp->fid; | ||
| 1449 | trace_afs_make_fs_call(call, &vp->fid); | 1465 | trace_afs_make_fs_call(call, &vp->fid); |
| 1450 | afs_make_op_call(op, call, GFP_NOFS); | 1466 | afs_make_op_call(op, call, GFP_NOFS); |
| 1451 | } | 1467 | } |
| @@ -1528,6 +1544,7 @@ void afs_fs_set_lock(struct afs_operation *op) · 76 unmodified lines | |||
| 1528 | *bp++ = htonl(vp->fid.unique); | 1544 | *bp++ = htonl(vp->fid.unique); |
| 1529 | *bp++ = htonl(op->lock.type); | 1545 | *bp++ = htonl(op->lock.type); |
| 1530 | 1546 | ||
| 1547 | call->fid = vp->fid; | ||
| 1531 | trace_afs_make_fs_calli(call, &vp->fid, op->lock.type); | 1548 | trace_afs_make_fs_calli(call, &vp->fid, op->lock.type); |
| 1532 | afs_make_op_call(op, call, GFP_NOFS); | 1549 | afs_make_op_call(op, call, GFP_NOFS); |
| 1533 | } | 1550 | } |
| @@ -1554,6 +1571,7 @@ void afs_fs_extend_lock(struct afs_operation *op) · 20 unmodified lines | |||
| 1554 | *bp++ = htonl(vp->fid.vnode); | 1571 | *bp++ = htonl(vp->fid.vnode); |
| 1555 | *bp++ = htonl(vp->fid.unique); | 1572 | *bp++ = htonl(vp->fid.unique); |
| 1556 | 1573 | ||
| 1574 | call->fid = vp->fid; | ||
| 1557 | trace_afs_make_fs_call(call, &vp->fid); | 1575 | trace_afs_make_fs_call(call, &vp->fid); |
| 1558 | afs_make_op_call(op, call, GFP_NOFS); | 1576 | afs_make_op_call(op, call, GFP_NOFS); |
| 1559 | } | 1577 | } |
| @@ -1580,6 +1598,7 @@ void afs_fs_release_lock(struct afs_operation *op) · 20 unmodified lines | |||
| 1580 | *bp++ = htonl(vp->fid.vnode); | 1598 | *bp++ = htonl(vp->fid.vnode); |
| 1581 | *bp++ = htonl(vp->fid.unique); | 1599 | *bp++ = htonl(vp->fid.unique); |
| 1582 | 1600 | ||
| 1601 | call->fid = vp->fid; | ||
| 1583 | trace_afs_make_fs_call(call, &vp->fid); | 1602 | trace_afs_make_fs_call(call, &vp->fid); |
| 1584 | afs_make_op_call(op, call, GFP_NOFS); | 1603 | afs_make_op_call(op, call, GFP_NOFS); |
| 1585 | } | 1604 | } |
| @@ -1948,6 +1967,7 @@ void afs_fs_inline_bulk_status(struct afs_operation *op) · 362 unmodified lines | |||
| 1948 | *bp++ = htonl(op->more_files[i].fid.unique); | 1967 | *bp++ = htonl(op->more_files[i].fid.unique); |
| 1949 | } | 1968 | } |
| 1950 | 1969 | ||
| 1970 | call->fid = vp->fid; | ||
| 1951 | trace_afs_make_fs_call(call, &vp->fid); | 1971 | trace_afs_make_fs_call(call, &vp->fid); |
| 1952 | afs_make_op_call(op, call, GFP_NOFS); | 1972 | afs_make_op_call(op, call, GFP_NOFS); |
| 1953 | } | 1973 | } |
| @@ -2053,6 +2073,7 @@ void afs_fs_fetch_acl(struct afs_operation *op) · 99 unmodified lines | |||
| 2053 | bp[2] = htonl(vp->fid.vnode); | 2073 | bp[2] = htonl(vp->fid.vnode); |
| 2054 | bp[3] = htonl(vp->fid.unique); | 2074 | bp[3] = htonl(vp->fid.unique); |
| 2055 | 2075 | ||
| 2076 | call->fid = vp->fid; | ||
| 2056 | trace_afs_make_fs_call(call, &vp->fid); | 2077 | trace_afs_make_fs_call(call, &vp->fid); |
| 2057 | afs_make_op_call(op, call, GFP_KERNEL); | 2078 | afs_make_op_call(op, call, GFP_KERNEL); |
| 2058 | } | 2079 | } |
| @@ -2098,6 +2119,7 @@ void afs_fs_store_acl(struct afs_operation *op) · 39 unmodified lines | |||
| 2098 | if (acl->size != size) | 2119 | if (acl->size != size) |
| 2099 | memset((void *)&bp[5] + acl->size, 0, size - acl->size); | 2120 | memset((void *)&bp[5] + acl->size, 0, size - acl->size); |
| 2100 | 2121 | ||
| 2122 | call->fid = vp->fid; | ||
| 2101 | trace_afs_make_fs_call(call, &vp->fid); | 2123 | trace_afs_make_fs_call(call, &vp->fid); |
| 2102 | afs_make_op_call(op, call, GFP_KERNEL); | 2124 | afs_make_op_call(op, call, GFP_KERNEL); |
| 2103 | } | 2125 | } |
| @@ -153,6 +153,7 @@ struct afs_call { · 152 unmodified lines | |||
| 153 | struct afs_vldb_entry *ret_vldb; | 153 | struct afs_vldb_entry *ret_vldb; |
| 154 | char *ret_str; | 154 | char *ret_str; |
| 155 | }; | 155 | }; |
| 156 | struct afs_fid fid; /* Primary vnode ID (or all zeroes) */ | ||
| 156 | unsigned char probe_index; /* Address in ->probe_alist */ | 157 | unsigned char probe_index; /* Address in ->probe_alist */ |
| 157 | struct afs_operation *op; | 158 | struct afs_operation *op; |
| 158 | unsigned int server_index; | 159 | unsigned int server_index; |
| @@ -313,6 +313,8 @@ void afs_make_call(struct afs_call *call, gfp_t gfp) · 312 unmodified lines | |||
| 313 | call, call->type->name, key_serial(call->key), | 313 | call, call->type->name, key_serial(call->key), |
| 314 | atomic_read(&call->net->nr_outstanding_calls)); | 314 | atomic_read(&call->net->nr_outstanding_calls)); |
| 315 | 315 | ||
| 316 | trace_afs_make_call(call); | ||
| 317 | |||
| 316 | /* Work out the length we're going to transmit. This is awkward for | 318 | /* Work out the length we're going to transmit. This is awkward for |
| 317 | * calls such as FS.StoreData where there's an extra injection of data | 319 | * calls such as FS.StoreData where there's an extra injection of data |
| 318 | * after the initial fixed part. | 320 | * after the initial fixed part. |
| @@ -493,6 +493,7 @@ void yfs_fs_fetch_data(struct afs_operation *op) · 492 unmodified lines | |||
| 493 | bp = xdr_encode_u64(bp, req->len); | 493 | bp = xdr_encode_u64(bp, req->len); |
| 494 | yfs_check_req(call, bp); | 494 | yfs_check_req(call, bp); |
| 495 | 495 | ||
| 496 | call->fid = vp->fid; | ||
| 496 | trace_afs_make_fs_call(call, &vp->fid); | 497 | trace_afs_make_fs_call(call, &vp->fid); |
| 497 | afs_make_op_call(op, call, GFP_NOFS); | 498 | afs_make_op_call(op, call, GFP_NOFS); |
| 498 | } | 499 | } |
| @@ -575,6 +576,7 @@ void yfs_fs_create_file(struct afs_operation *op) · 76 unmodified lines | |||
| 575 | bp = xdr_encode_u32(bp, yfs_LockNone); /* ViceLockType */ | 576 | bp = xdr_encode_u32(bp, yfs_LockNone); /* ViceLockType */ |
| 576 | yfs_check_req(call, bp); | 577 | yfs_check_req(call, bp); |
| 577 | 578 | ||
| 579 | call->fid = dvp->fid; | ||
| 578 | trace_afs_make_fs_call1(call, &dvp->fid, name); | 580 | trace_afs_make_fs_call1(call, &dvp->fid, name); |
| 579 | afs_make_op_call(op, call, GFP_NOFS); | 581 | afs_make_op_call(op, call, GFP_NOFS); |
| 580 | } | 582 | } |
| @@ -623,6 +625,7 @@ void yfs_fs_make_dir(struct afs_operation *op) · 42 unmodified lines | |||
| 623 | bp = xdr_encode_YFSStoreStatus(bp, &op->create.mode, &op->mtime); | 625 | bp = xdr_encode_YFSStoreStatus(bp, &op->create.mode, &op->mtime); |
| 624 | yfs_check_req(call, bp); | 626 | yfs_check_req(call, bp); |
| 625 | 627 | ||
| 628 | call->fid = dvp->fid; | ||
| 626 | trace_afs_make_fs_call1(call, &dvp->fid, name); | 629 | trace_afs_make_fs_call1(call, &dvp->fid, name); |
| 627 | afs_make_op_call(op, call, GFP_NOFS); | 630 | afs_make_op_call(op, call, GFP_NOFS); |
| 628 | } | 631 | } |
| @@ -707,6 +710,7 @@ void yfs_fs_remove_file2(struct afs_operation *op) · 78 unmodified lines | |||
| 707 | bp = xdr_encode_name(bp, name); | 710 | bp = xdr_encode_name(bp, name); |
| 708 | yfs_check_req(call, bp); | 711 | yfs_check_req(call, bp); |
| 709 | 712 | ||
| 713 | call->fid = dvp->fid; | ||
| 710 | trace_afs_make_fs_call1(call, &dvp->fid, name); | 714 | trace_afs_make_fs_call1(call, &dvp->fid, name); |
| 711 | afs_make_op_call(op, call, GFP_NOFS); | 715 | afs_make_op_call(op, call, GFP_NOFS); |
| 712 | } | 716 | } |
| @@ -776,6 +780,7 @@ void yfs_fs_remove_file(struct afs_operation *op) · 63 unmodified lines | |||
| 776 | bp = xdr_encode_name(bp, name); | 780 | bp = xdr_encode_name(bp, name); |
| 777 | yfs_check_req(call, bp); | 781 | yfs_check_req(call, bp); |
| 778 | 782 | ||
| 783 | call->fid = dvp->fid; | ||
| 779 | trace_afs_make_fs_call1(call, &dvp->fid, name); | 784 | trace_afs_make_fs_call1(call, &dvp->fid, name); |
| 780 | afs_make_op_call(op, call, GFP_NOFS); | 785 | afs_make_op_call(op, call, GFP_NOFS); |
| 781 | } | 786 | } |
| @@ -817,6 +822,7 @@ void yfs_fs_remove_dir(struct afs_operation *op) · 35 unmodified lines | |||
| 817 | bp = xdr_encode_name(bp, name); | 822 | bp = xdr_encode_name(bp, name); |
| 818 | yfs_check_req(call, bp); | 823 | yfs_check_req(call, bp); |
| 819 | 824 | ||
| 825 | call->fid = dvp->fid; | ||
| 820 | trace_afs_make_fs_call1(call, &dvp->fid, name); | 826 | trace_afs_make_fs_call1(call, &dvp->fid, name); |
| 821 | afs_make_op_call(op, call, GFP_NOFS); | 827 | afs_make_op_call(op, call, GFP_NOFS); |
| 822 | } | 828 | } |
| @@ -890,6 +896,7 @@ void yfs_fs_link(struct afs_operation *op) · 67 unmodified lines | |||
| 890 | bp = xdr_encode_YFSFid(bp, &vp->fid); | 896 | bp = xdr_encode_YFSFid(bp, &vp->fid); |
| 891 | yfs_check_req(call, bp); | 897 | yfs_check_req(call, bp); |
| 892 | 898 | ||
| 899 | call->fid = vp->fid; | ||
| 893 | trace_afs_make_fs_call1(call, &vp->fid, name); | 900 | trace_afs_make_fs_call1(call, &vp->fid, name); |
| 894 | afs_make_op_call(op, call, GFP_NOFS); | 901 | afs_make_op_call(op, call, GFP_NOFS); |
| 895 | } | 902 | } |
| @@ -971,6 +978,7 @@ void yfs_fs_symlink(struct afs_operation *op) · 75 unmodified lines | |||
| 971 | bp = xdr_encode_YFSStoreStatus(bp, &mode, &op->mtime); | 978 | bp = xdr_encode_YFSStoreStatus(bp, &mode, &op->mtime); |
| 972 | yfs_check_req(call, bp); | 979 | yfs_check_req(call, bp); |
| 973 | 980 | ||
| 981 | call->fid = dvp->fid; | ||
| 974 | trace_afs_make_fs_call1(call, &dvp->fid, name); | 982 | trace_afs_make_fs_call1(call, &dvp->fid, name); |
| 975 | afs_make_op_call(op, call, GFP_NOFS); | 983 | afs_make_op_call(op, call, GFP_NOFS); |
| 976 | } | 984 | } |
| @@ -1050,6 +1058,7 @@ void yfs_fs_rename(struct afs_operation *op) · 73 unmodified lines | |||
| 1050 | bp = xdr_encode_name(bp, new_name); | 1058 | bp = xdr_encode_name(bp, new_name); |
| 1051 | yfs_check_req(call, bp); | 1059 | yfs_check_req(call, bp); |
| 1052 | 1060 | ||
| 1061 | call->fid = orig_dvp->fid; | ||
| 1053 | trace_afs_make_fs_call2(call, &orig_dvp->fid, orig_name, new_name); | 1062 | trace_afs_make_fs_call2(call, &orig_dvp->fid, orig_name, new_name); |
| 1054 | afs_make_op_call(op, call, GFP_NOFS); | 1063 | afs_make_op_call(op, call, GFP_NOFS); |
| 1055 | } | 1064 | } |
| @@ -1105,6 +1114,7 @@ void yfs_fs_store_data(struct afs_operation *op) · 49 unmodified lines | |||
| 1105 | bp = xdr_encode_u64(bp, op->store.i_size); | 1114 | bp = xdr_encode_u64(bp, op->store.i_size); |
| 1106 | yfs_check_req(call, bp); | 1115 | yfs_check_req(call, bp); |
| 1107 | 1116 | ||
| 1117 | call->fid = vp->fid; | ||
| 1108 | trace_afs_make_fs_call(call, &vp->fid); | 1118 | trace_afs_make_fs_call(call, &vp->fid); |
| 1109 | afs_make_op_call(op, call, GFP_NOFS); | 1119 | afs_make_op_call(op, call, GFP_NOFS); |
| 1110 | } | 1120 | } |
| @@ -1161,6 +1171,7 @@ static void yfs_fs_setattr_size(struct afs_operation *op) · 50 unmodified lines | |||
| 1161 | bp = xdr_encode_u64(bp, attr->ia_size); /* new file length */ | 1171 | bp = xdr_encode_u64(bp, attr->ia_size); /* new file length */ |
| 1162 | yfs_check_req(call, bp); | 1172 | yfs_check_req(call, bp); |
| 1163 | 1173 | ||
| 1174 | call->fid = vp->fid; | ||
| 1164 | trace_afs_make_fs_call(call, &vp->fid); | 1175 | trace_afs_make_fs_call(call, &vp->fid); |
| 1165 | afs_make_op_call(op, call, GFP_NOFS); | 1176 | afs_make_op_call(op, call, GFP_NOFS); |
| 1166 | } | 1177 | } |
| @@ -1199,6 +1210,7 @@ void yfs_fs_setattr(struct afs_operation *op) · 32 unmodified lines | |||
| 1199 | bp = xdr_encode_YFS_StoreStatus(bp, attr); | 1210 | bp = xdr_encode_YFS_StoreStatus(bp, attr); |
| 1200 | yfs_check_req(call, bp); | 1211 | yfs_check_req(call, bp); |
| 1201 | 1212 | ||
| 1213 | call->fid = vp->fid; | ||
| 1202 | trace_afs_make_fs_call(call, &vp->fid); | 1214 | trace_afs_make_fs_call(call, &vp->fid); |
| 1203 | afs_make_op_call(op, call, GFP_NOFS); | 1215 | afs_make_op_call(op, call, GFP_NOFS); |
| 1204 | } | 1216 | } |
| @@ -1369,6 +1381,7 @@ void yfs_fs_get_volume_status(struct afs_operation *op) · 164 unmodified lines | |||
| 1369 | bp = xdr_encode_u64(bp, vp->fid.vid); | 1381 | bp = xdr_encode_u64(bp, vp->fid.vid); |
| 1370 | yfs_check_req(call, bp); | 1382 | yfs_check_req(call, bp); |
| 1371 | 1383 | ||
| 1384 | call->fid = vp->fid; | ||
| 1372 | trace_afs_make_fs_call(call, &vp->fid); | 1385 | trace_afs_make_fs_call(call, &vp->fid); |
| 1373 | afs_make_op_call(op, call, GFP_NOFS); | 1386 | afs_make_op_call(op, call, GFP_NOFS); |
| 1374 | } | 1387 | } |
| @@ -1433,6 +1446,7 @@ void yfs_fs_set_lock(struct afs_operation *op) · 58 unmodified lines | |||
| 1433 | bp = xdr_encode_u32(bp, op->lock.type); | 1446 | bp = xdr_encode_u32(bp, op->lock.type); |
| 1434 | yfs_check_req(call, bp); | 1447 | yfs_check_req(call, bp); |
| 1435 | 1448 | ||
| 1449 | call->fid = vp->fid; | ||
| 1436 | trace_afs_make_fs_calli(call, &vp->fid, op->lock.type); | 1450 | trace_afs_make_fs_calli(call, &vp->fid, op->lock.type); |
| 1437 | afs_make_op_call(op, call, GFP_NOFS); | 1451 | afs_make_op_call(op, call, GFP_NOFS); |
| 1438 | } | 1452 | } |
| @@ -1463,6 +1477,7 @@ void yfs_fs_extend_lock(struct afs_operation *op) · 24 unmodified lines | |||
| 1463 | bp = xdr_encode_YFSFid(bp, &vp->fid); | 1477 | bp = xdr_encode_YFSFid(bp, &vp->fid); |
| 1464 | yfs_check_req(call, bp); | 1478 | yfs_check_req(call, bp); |
| 1465 | 1479 | ||
| 1480 | call->fid = vp->fid; | ||
| 1466 | trace_afs_make_fs_call(call, &vp->fid); | 1481 | trace_afs_make_fs_call(call, &vp->fid); |
| 1467 | afs_make_op_call(op, call, GFP_NOFS); | 1482 | afs_make_op_call(op, call, GFP_NOFS); |
| 1468 | } | 1483 | } |
| @@ -1493,6 +1508,7 @@ void yfs_fs_release_lock(struct afs_operation *op) · 24 unmodified lines | |||
| 1493 | bp = xdr_encode_YFSFid(bp, &vp->fid); | 1508 | bp = xdr_encode_YFSFid(bp, &vp->fid); |
| 1494 | yfs_check_req(call, bp); | 1509 | yfs_check_req(call, bp); |
| 1495 | 1510 | ||
| 1511 | call->fid = vp->fid; | ||
| 1496 | trace_afs_make_fs_call(call, &vp->fid); | 1512 | trace_afs_make_fs_call(call, &vp->fid); |
| 1497 | afs_make_op_call(op, call, GFP_NOFS); | 1513 | afs_make_op_call(op, call, GFP_NOFS); |
| 1498 | } | 1514 | } |
| @@ -1559,6 +1575,7 @@ void yfs_fs_fetch_status(struct afs_operation *op) · 60 unmodified lines | |||
| 1559 | bp = xdr_encode_YFSFid(bp, &vp->fid); | 1575 | bp = xdr_encode_YFSFid(bp, &vp->fid); |
| 1560 | yfs_check_req(call, bp); | 1576 | yfs_check_req(call, bp); |
| 1561 | 1577 | ||
| 1578 | call->fid = vp->fid; | ||
| 1562 | trace_afs_make_fs_call(call, &vp->fid); | 1579 | trace_afs_make_fs_call(call, &vp->fid); |
| 1563 | afs_make_op_call(op, call, GFP_NOFS); | 1580 | afs_make_op_call(op, call, GFP_NOFS); |
| 1564 | } | 1581 | } |
| @@ -1739,6 +1756,7 @@ void yfs_fs_inline_bulk_status(struct afs_operation *op) · 174 unmodified lines | |||
| 1739 | bp = xdr_encode_YFSFid(bp, &op->more_files[i].fid); | 1756 | bp = xdr_encode_YFSFid(bp, &op->more_files[i].fid); |
| 1740 | yfs_check_req(call, bp); | 1757 | yfs_check_req(call, bp); |
| 1741 | 1758 | ||
| 1759 | call->fid = vp->fid; | ||
| 1742 | trace_afs_make_fs_call(call, &vp->fid); | 1760 | trace_afs_make_fs_call(call, &vp->fid); |
| 1743 | afs_make_op_call(op, call, GFP_NOFS); | 1761 | afs_make_op_call(op, call, GFP_NOFS); |
| 1744 | } | 1762 | } |
| @@ -1901,6 +1919,7 @@ void yfs_fs_fetch_opaque_acl(struct afs_operation *op) · 156 unmodified lines | |||
| 1901 | bp = xdr_encode_YFSFid(bp, &vp->fid); | 1919 | bp = xdr_encode_YFSFid(bp, &vp->fid); |
| 1902 | yfs_check_req(call, bp); | 1920 | yfs_check_req(call, bp); |
| 1903 | 1921 | ||
| 1922 | call->fid = vp->fid; | ||
| 1904 | trace_afs_make_fs_call(call, &vp->fid); | 1923 | trace_afs_make_fs_call(call, &vp->fid); |
| 1905 | afs_make_op_call(op, call, GFP_KERNEL); | 1924 | afs_make_op_call(op, call, GFP_KERNEL); |
| 1906 | } | 1925 | } |
| @@ -1951,6 +1970,7 @@ void yfs_fs_store_opaque_acl2(struct afs_operation *op) · 44 unmodified lines | |||
| 1951 | bp += size / sizeof(__be32); | 1970 | bp += size / sizeof(__be32); |
| 1952 | yfs_check_req(call, bp); | 1971 | yfs_check_req(call, bp); |
| 1953 | 1972 | ||
| 1973 | call->fid = vp->fid; | ||
| 1954 | trace_afs_make_fs_call(call, &vp->fid); | 1974 | trace_afs_make_fs_call(call, &vp->fid); |
| 1955 | afs_make_op_call(op, call, GFP_KERNEL); | 1975 | afs_make_op_call(op, call, GFP_KERNEL); |
| 1956 | } | 1976 | } |
| @@ -1576,6 +1576,42 @@ TRACE_EVENT(afs_rotate, · 1575 unmodified lines | |||
| 1576 | __entry->extra) | 1576 | __entry->extra) |
| 1577 | ); | 1577 | ); |
| 1578 | 1578 | ||
| 1579 | TRACE_EVENT(afs_make_call, | ||
| 1580 | TP_PROTO(struct afs_call *call), | ||
| 1581 | |||
| 1582 | TP_ARGS(call), | ||
| 1583 | |||
| 1584 | TP_STRUCT__entry( | ||
| 1585 | __field(unsigned int, call) | ||
| 1586 | __field(bool, is_vl) | ||
| 1587 | __field(enum afs_fs_operation, op) | ||
| 1588 | __field_struct(struct afs_fid, fid) | ||
| 1589 | __field_struct(struct sockaddr_rxrpc, srx) | ||
| 1590 | ), | ||
| 1591 | |||
| 1592 | TP_fast_assign( | ||
| 1593 | __entry->call = call->debug_id; | ||
| 1594 | __entry->op = call->operation_ID; | ||
| 1595 | __entry->fid = call->fid; | ||
| 1596 | memcpy(&__entry->srx, rxrpc_kernel_remote_srx(call->peer), | ||
| 1597 | sizeof(__entry->srx)); | ||
| 1598 | __entry->srx.srx_service = call->service_id; | ||
| 1599 | __entry->is_vl = (__entry->srx.srx_service == VL_SERVICE || | ||
| 1600 | __entry->srx.srx_service == YFS_VL_SERVICE); | ||
| 1601 | ), | ||
| 1602 | |||
| 1603 | TP_printk("c=%08x %pISpc+%u %s %llx:%llx:%x", | ||
| 1604 | __entry->call, | ||
| 1605 | &__entry->srx.transport, | ||
| 1606 | __entry->srx.srx_service, | ||
| 1607 | __entry->is_vl ? | ||
| 1608 | __print_symbolic(__entry->op, afs_vl_operations) : | ||
| 1609 | __print_symbolic(__entry->op, afs_fs_operations), | ||
| 1610 | __entry->fid.vid, | ||
| 1611 | __entry->fid.vnode, | ||
| 1612 | __entry->fid.unique) | ||
| 1613 | ); | ||
| 1614 | |||
| 1579 | #endif /* _TRACE_AFS_H */ | 1615 | #endif /* _TRACE_AFS_H */ |
| 1580 | 1616 | ||
| 1581 | /* This part must be outside protection */ | 1617 | /* This part must be outside protection */ |