linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: "Darrick J . Wong" <darrick.wong@oracle.com>
Cc: Damien Le Moal <Damien.LeMoal@wdc.com>,
	Andreas Gruenbacher <agruenba@redhat.com>,
	linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 06/11] xfs: remove the readpage / readpages tracing code
Date: Tue,  1 Oct 2019 09:11:47 +0200	[thread overview]
Message-ID: <20191001071152.24403-7-hch@lst.de> (raw)
In-Reply-To: <20191001071152.24403-1-hch@lst.de>

The actual iomap implementations now have equivalent trace points.

Signed-off-by: Christoph Hellwig <hch@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


  parent reply	other threads:[~2019-10-01  7:16 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-01  7:11 lift the xfs writepage code into iomap v5 Christoph Hellwig
2019-10-01  7:11 ` [PATCH 01/11] iomap: add tracing for the readpage / readpages Christoph Hellwig
2019-10-01 15:23   ` Brian Foster
2019-10-01 20:52   ` Darrick J. Wong
2019-10-04 23:49   ` Darrick J. Wong
2019-10-01  7:11 ` [PATCH 02/11] iomap: copy the xfs writeback code to iomap.c Christoph Hellwig
2019-10-01  7:11 ` [PATCH 03/11] iomap: warn on inline maps in iomap_writepage_map Christoph Hellwig
2019-10-01  7:11 ` [PATCH 04/11] xfs: set IOMAP_F_NEW more carefully Christoph Hellwig
2019-10-01  7:11 ` [PATCH 05/11] iomap: zero newly allocated mapped blocks Christoph Hellwig
2019-10-01  7:11 ` Christoph Hellwig [this message]
2019-10-01 15:23   ` [PATCH 06/11] xfs: remove the readpage / readpages tracing code Brian Foster
2019-10-02 15:38   ` Darrick J. Wong
2019-10-01  7:11 ` [PATCH 07/11] xfs: initialize iomap->flags in xfs_bmbt_to_iomap Christoph Hellwig
2019-10-01  7:11 ` [PATCH 08/11] xfs: use a struct iomap in xfs_writepage_ctx Christoph Hellwig
2019-10-01  7:11 ` [PATCH 09/11] xfs: remove the fork fields in the writepage_ctx and ioend Christoph Hellwig
2019-10-01  7:11 ` [PATCH 10/11] xfs: use the iomap write page code Christoph Hellwig
2019-10-02 18:04   ` Brian Foster
2019-10-01  7:11 ` [PATCH 11/11] iomap: move struct iomap_page out of iomap.h Christoph Hellwig
2019-10-06 15:45 lift the xfs writepage code into iomap v6 Christoph Hellwig
2019-10-06 15:46 ` [PATCH 06/11] xfs: remove the readpage / readpages tracing code Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191001071152.24403-7-hch@lst.de \
    --to=hch@lst.de \
    --cc=Damien.LeMoal@wdc.com \
    --cc=agruenba@redhat.com \
    --cc=darrick.wong@oracle.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).