btrfs: update the writepage tracepoint to take a folio

Willy is wanting to get rid of page->index, convert the writepage
tracepoint to take a folio so we can do folio->index instead of
page->index.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 6cabeab5d21c48f6b5fe8d394be441189c0cbbe7..51cadf9e61a17f1ccefc6b4526f6b1207bc060dd 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1531,7 +1531,7 @@ static int __extent_writepage(struct page *page, struct btrfs_bio_ctrl *bio_ctrl
        loff_t i_size = i_size_read(inode);
        unsigned long end_index = i_size >> PAGE_SHIFT;
 
-       trace___extent_writepage(page, inode, bio_ctrl->wbc);
+       trace___extent_writepage(folio, inode, bio_ctrl->wbc);
 
        WARN_ON(!PageLocked(page));
 

diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
index 0a523023bdcc38e3c20a0d28a58a836381cb34b0..0eddbb8b67283c0c9ff269c05e880411f97bbd36 100644 (file)
--- a/include/trace/events/btrfs.h
+++ b/include/trace/events/btrfs.h
@@ -674,10 +674,10 @@ TRACE_EVENT(btrfs_finish_ordered_extent,
 
 DECLARE_EVENT_CLASS(btrfs__writepage,
 
-       TP_PROTO(const struct page *page, const struct inode *inode,
+       TP_PROTO(const struct folio *folio, const struct inode *inode,
                 const struct writeback_control *wbc),
 
-       TP_ARGS(page, inode, wbc),
+       TP_ARGS(folio, inode, wbc),
 
        TP_STRUCT__entry_btrfs(
                __field(        u64,    ino                     )
@@ -695,7 +695,7 @@ DECLARE_EVENT_CLASS(btrfs__writepage,
 
        TP_fast_assign_btrfs(btrfs_sb(inode->i_sb),
                __entry->ino            = btrfs_ino(BTRFS_I(inode));
-               __entry->index          = page->index;
+               __entry->index          = folio->index;
                __entry->nr_to_write    = wbc->nr_to_write;
                __entry->pages_skipped  = wbc->pages_skipped;
                __entry->range_start    = wbc->range_start;
@@ -723,10 +723,10 @@ DECLARE_EVENT_CLASS(btrfs__writepage,
 
 DEFINE_EVENT(btrfs__writepage, __extent_writepage,
 
-       TP_PROTO(const struct page *page, const struct inode *inode,
+       TP_PROTO(const struct folio *folio, const struct inode *inode,
                 const struct writeback_control *wbc),
 
-       TP_ARGS(page, inode, wbc)
+       TP_ARGS(folio, inode, wbc)
 );
 
 TRACE_EVENT(btrfs_writepage_end_io_hook,