diff options
Diffstat (limited to 'fs/nfs/nfs4trace.h')
-rw-r--r-- | fs/nfs/nfs4trace.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h index 0a744f3a86f6..1c32adbe728d 100644 --- a/fs/nfs/nfs4trace.h +++ b/fs/nfs/nfs4trace.h | |||
@@ -932,11 +932,11 @@ DEFINE_NFS4_IDMAP_EVENT(nfs4_map_gid_to_group); | |||
932 | 932 | ||
933 | DECLARE_EVENT_CLASS(nfs4_read_event, | 933 | DECLARE_EVENT_CLASS(nfs4_read_event, |
934 | TP_PROTO( | 934 | TP_PROTO( |
935 | const struct nfs_pgio_data *data, | 935 | const struct nfs_pgio_header *hdr, |
936 | int error | 936 | int error |
937 | ), | 937 | ), |
938 | 938 | ||
939 | TP_ARGS(data, error), | 939 | TP_ARGS(hdr, error), |
940 | 940 | ||
941 | TP_STRUCT__entry( | 941 | TP_STRUCT__entry( |
942 | __field(dev_t, dev) | 942 | __field(dev_t, dev) |
@@ -948,12 +948,12 @@ DECLARE_EVENT_CLASS(nfs4_read_event, | |||
948 | ), | 948 | ), |
949 | 949 | ||
950 | TP_fast_assign( | 950 | TP_fast_assign( |
951 | const struct inode *inode = data->header->inode; | 951 | const struct inode *inode = hdr->inode; |
952 | __entry->dev = inode->i_sb->s_dev; | 952 | __entry->dev = inode->i_sb->s_dev; |
953 | __entry->fileid = NFS_FILEID(inode); | 953 | __entry->fileid = NFS_FILEID(inode); |
954 | __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode)); | 954 | __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode)); |
955 | __entry->offset = data->args.offset; | 955 | __entry->offset = hdr->args.offset; |
956 | __entry->count = data->args.count; | 956 | __entry->count = hdr->args.count; |
957 | __entry->error = error; | 957 | __entry->error = error; |
958 | ), | 958 | ), |
959 | 959 | ||
@@ -972,10 +972,10 @@ DECLARE_EVENT_CLASS(nfs4_read_event, | |||
972 | #define DEFINE_NFS4_READ_EVENT(name) \ | 972 | #define DEFINE_NFS4_READ_EVENT(name) \ |
973 | DEFINE_EVENT(nfs4_read_event, name, \ | 973 | DEFINE_EVENT(nfs4_read_event, name, \ |
974 | TP_PROTO( \ | 974 | TP_PROTO( \ |
975 | const struct nfs_pgio_data *data, \ | 975 | const struct nfs_pgio_header *hdr, \ |
976 | int error \ | 976 | int error \ |
977 | ), \ | 977 | ), \ |
978 | TP_ARGS(data, error)) | 978 | TP_ARGS(hdr, error)) |
979 | DEFINE_NFS4_READ_EVENT(nfs4_read); | 979 | DEFINE_NFS4_READ_EVENT(nfs4_read); |
980 | #ifdef CONFIG_NFS_V4_1 | 980 | #ifdef CONFIG_NFS_V4_1 |
981 | DEFINE_NFS4_READ_EVENT(nfs4_pnfs_read); | 981 | DEFINE_NFS4_READ_EVENT(nfs4_pnfs_read); |
@@ -983,11 +983,11 @@ DEFINE_NFS4_READ_EVENT(nfs4_pnfs_read); | |||
983 | 983 | ||
984 | DECLARE_EVENT_CLASS(nfs4_write_event, | 984 | DECLARE_EVENT_CLASS(nfs4_write_event, |
985 | TP_PROTO( | 985 | TP_PROTO( |
986 | const struct nfs_pgio_data *data, | 986 | const struct nfs_pgio_header *hdr, |
987 | int error | 987 | int error |
988 | ), | 988 | ), |
989 | 989 | ||
990 | TP_ARGS(data, error), | 990 | TP_ARGS(hdr, error), |
991 | 991 | ||
992 | TP_STRUCT__entry( | 992 | TP_STRUCT__entry( |
993 | __field(dev_t, dev) | 993 | __field(dev_t, dev) |
@@ -999,12 +999,12 @@ DECLARE_EVENT_CLASS(nfs4_write_event, | |||
999 | ), | 999 | ), |
1000 | 1000 | ||
1001 | TP_fast_assign( | 1001 | TP_fast_assign( |
1002 | const struct inode *inode = data->header->inode; | 1002 | const struct inode *inode = hdr->inode; |
1003 | __entry->dev = inode->i_sb->s_dev; | 1003 | __entry->dev = inode->i_sb->s_dev; |
1004 | __entry->fileid = NFS_FILEID(inode); | 1004 | __entry->fileid = NFS_FILEID(inode); |
1005 | __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode)); | 1005 | __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode)); |
1006 | __entry->offset = data->args.offset; | 1006 | __entry->offset = hdr->args.offset; |
1007 | __entry->count = data->args.count; | 1007 | __entry->count = hdr->args.count; |
1008 | __entry->error = error; | 1008 | __entry->error = error; |
1009 | ), | 1009 | ), |
1010 | 1010 | ||
@@ -1024,10 +1024,10 @@ DECLARE_EVENT_CLASS(nfs4_write_event, | |||
1024 | #define DEFINE_NFS4_WRITE_EVENT(name) \ | 1024 | #define DEFINE_NFS4_WRITE_EVENT(name) \ |
1025 | DEFINE_EVENT(nfs4_write_event, name, \ | 1025 | DEFINE_EVENT(nfs4_write_event, name, \ |
1026 | TP_PROTO( \ | 1026 | TP_PROTO( \ |
1027 | const struct nfs_pgio_data *data, \ | 1027 | const struct nfs_pgio_header *hdr, \ |
1028 | int error \ | 1028 | int error \ |
1029 | ), \ | 1029 | ), \ |
1030 | TP_ARGS(data, error)) | 1030 | TP_ARGS(hdr, error)) |
1031 | DEFINE_NFS4_WRITE_EVENT(nfs4_write); | 1031 | DEFINE_NFS4_WRITE_EVENT(nfs4_write); |
1032 | #ifdef CONFIG_NFS_V4_1 | 1032 | #ifdef CONFIG_NFS_V4_1 |
1033 | DEFINE_NFS4_WRITE_EVENT(nfs4_pnfs_write); | 1033 | DEFINE_NFS4_WRITE_EVENT(nfs4_pnfs_write); |