Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[karo-tx-linux.git] / fs / nfs / nfs4trace.h

diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index 849cf146db3068ca063a10594324c66e525bbf60..0a744f3a86f6f592c9913f60a4b99c5d715d6324 100644 (file)
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -932,7 +932,7 @@ DEFINE_NFS4_IDMAP_EVENT(nfs4_map_gid_to_group);
 
 DECLARE_EVENT_CLASS(nfs4_read_event,
                TP_PROTO(
-                       const struct nfs_read_data *data,
+                       const struct nfs_pgio_data *data,
                        int error
                ),
 
@@ -972,7 +972,7 @@ DECLARE_EVENT_CLASS(nfs4_read_event,
 #define DEFINE_NFS4_READ_EVENT(name) \
        DEFINE_EVENT(nfs4_read_event, name, \
                        TP_PROTO( \
-                               const struct nfs_read_data *data, \
+                               const struct nfs_pgio_data *data, \
                                int error \
                        ), \
                        TP_ARGS(data, error))
@@ -983,7 +983,7 @@ DEFINE_NFS4_READ_EVENT(nfs4_pnfs_read);
 
 DECLARE_EVENT_CLASS(nfs4_write_event,
                TP_PROTO(
-                       const struct nfs_write_data *data,
+                       const struct nfs_pgio_data *data,
                        int error
                ),
 
@@ -1024,7 +1024,7 @@ DECLARE_EVENT_CLASS(nfs4_write_event,
 #define DEFINE_NFS4_WRITE_EVENT(name) \
        DEFINE_EVENT(nfs4_write_event, name, \
                        TP_PROTO( \
-                               const struct nfs_write_data *data, \
+                               const struct nfs_pgio_data *data, \
                                int error \
                        ), \
                        TP_ARGS(data, error))