[PATCH 06/11] xfs: remove the readpage / readpages tracing code

[Christoph Hellwig]

The actual iomap implementations now have equivalent trace points.

Signed-off-by: Christoph Hellwig <h...@lst.de>
---
 fs/xfs/xfs_aops.c  |  2 --
 fs/xfs/xfs_trace.h | 26 --------------------------
 2 files changed, 28 deletions(-)

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index f16d5f196c6b..b6101673c8fb 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -1160,7 +1160,6 @@ xfs_vm_readpage(
        struct file             *unused,
        struct page             *page)
 {
-       trace_xfs_vm_readpage(page->mapping->host, 1);
        return iomap_readpage(page, &xfs_iomap_ops);
 }
 
@@ -1171,7 +1170,6 @@ xfs_vm_readpages(
        struct list_head        *pages,
        unsigned                nr_pages)
 {
-       trace_xfs_vm_readpages(mapping->host, nr_pages);
        return iomap_readpages(mapping, pages, nr_pages, &xfs_iomap_ops);
 }
 
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index eaae275ed430..eae4b29c174e 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -1197,32 +1197,6 @@ DEFINE_PAGE_EVENT(xfs_writepage);
 DEFINE_PAGE_EVENT(xfs_releasepage);
 DEFINE_PAGE_EVENT(xfs_invalidatepage);
 
-DECLARE_EVENT_CLASS(xfs_readpage_class,
-       TP_PROTO(struct inode *inode, int nr_pages),
-       TP_ARGS(inode, nr_pages),
-       TP_STRUCT__entry(
-               __field(dev_t, dev)
-               __field(xfs_ino_t, ino)
-               __field(int, nr_pages)
-       ),
-       TP_fast_assign(
-               __entry->dev = inode->i_sb->s_dev;
-               __entry->ino = inode->i_ino;
-               __entry->nr_pages = nr_pages;
-       ),
-       TP_printk("dev %d:%d ino 0x%llx nr_pages %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 __entry->ino,
-                 __entry->nr_pages)
-)
-
-#define DEFINE_READPAGE_EVENT(name)            \
-DEFINE_EVENT(xfs_readpage_class, name, \
-       TP_PROTO(struct inode *inode, int nr_pages), \
-       TP_ARGS(inode, nr_pages))
-DEFINE_READPAGE_EVENT(xfs_vm_readpage);
-DEFINE_READPAGE_EVENT(xfs_vm_readpages);
-
 DECLARE_EVENT_CLASS(xfs_imap_class,
        TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count,
                 int whichfork, struct xfs_bmbt_irec *irec),
-- 
2.20.1