tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: f2fs: Convert submit tracepoints to take a folio

Browse Source 
Remove accesses to page->index and page->mapping as well as
unnecessary calls to page_file_mapping().

Change-Id: Ib5cbf3668b156baad46de9721befb24468fa0481
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit 87e2a15bc00840762b082399493597e8d3c1e42c)
This commit is contained in:
Matthew Wilcox (Oracle)
2024-11-28 04:58:20 +00:00
committed by Jaegeuk Kim
parent fdfbb5de2e
commit 90c2a7c680
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/f2fs/data.c
+3 -3
View File
@@ -702,7 +702,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
META_GENERIC : DATA_GENERIC_ENHANCE)))
return -EFSCORRUPTED;
trace_f2fs_submit_page_bio(page, fio);
trace_f2fs_submit_folio_bio(page_folio(page), fio);
/* Allocate a new bio */
bio = __bio_alloc(fio, 1);
@@ -899,7 +899,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)
__is_meta_io(fio) ? META_GENERIC : DATA_GENERIC))
return -EFSCORRUPTED;
trace_f2fs_submit_page_bio(page, fio);
trace_f2fs_submit_folio_bio(page_folio(page), fio);
if (bio && !page_is_mergeable(fio->sbi, bio, *fio->last_block,
fio->new_blkaddr))
@@ -1023,7 +1023,7 @@ alloc_new:
io->last_block_in_bio = fio->new_blkaddr;
trace_f2fs_submit_page_write(fio->page, fio);
trace_f2fs_submit_folio_write(page_folio(fio->page), fio);
#ifdef CONFIG_BLK_DEV_ZONED
if (f2fs_sb_has_blkzoned(sbi) && btype < META &&
is_end_zone_blkaddr(sbi, fio->new_blkaddr)) {
include/trace/events/f2fs.h
+15 -15
View File
@@ -1119,11 +1119,11 @@ TRACE_EVENT(f2fs_reserve_new_blocks,
(unsigned long long)__entry->count)
);
DECLARE_EVENT_CLASS(f2fs__submit_page_bio,
DECLARE_EVENT_CLASS(f2fs__submit_folio_bio,
TP_PROTO(struct page *page, struct f2fs_io_info *fio),
TP_PROTO(struct folio *folio, struct f2fs_io_info *fio),
TP_ARGS(page, fio),
TP_ARGS(folio, fio),
TP_STRUCT__entry(
__field(dev_t, dev)
@@ -1138,9 +1138,9 @@ DECLARE_EVENT_CLASS(f2fs__submit_page_bio,
),
TP_fast_assign(
__entry->dev = page_file_mapping(page)->host->i_sb->s_dev;
__entry->ino = page_file_mapping(page)->host->i_ino;
__entry->index = page->index;
__entry->dev = folio->mapping->host->i_sb->s_dev;
__entry->ino = folio->mapping->host->i_ino;
__entry->index = folio->index;
__entry->old_blkaddr = fio->old_blkaddr;
__entry->new_blkaddr = fio->new_blkaddr;
__entry->op = fio->op;
@@ -1149,7 +1149,7 @@ DECLARE_EVENT_CLASS(f2fs__submit_page_bio,
__entry->type = fio->type;
),
TP_printk("dev = (%d,%d), ino = %lu, page_index = 0x%lx, "
TP_printk("dev = (%d,%d), ino = %lu, folio_index = 0x%lx, "
"oldaddr = 0x%llx, newaddr = 0x%llx, rw = %s(%s), type = %s_%s",
show_dev_ino(__entry),
(unsigned long)__entry->index,
@@ -1160,22 +1160,22 @@ DECLARE_EVENT_CLASS(f2fs__submit_page_bio,
show_block_type(__entry->type))
);
DEFINE_EVENT_CONDITION(f2fs__submit_page_bio, f2fs_submit_page_bio,
DEFINE_EVENT_CONDITION(f2fs__submit_folio_bio, f2fs_submit_folio_bio,
TP_PROTO(struct page *page, struct f2fs_io_info *fio),
TP_PROTO(struct folio *folio, struct f2fs_io_info *fio),
TP_ARGS(page, fio),
TP_ARGS(folio, fio),
TP_CONDITION(page->mapping)
TP_CONDITION(folio->mapping)
);
DEFINE_EVENT_CONDITION(f2fs__submit_page_bio, f2fs_submit_page_write,
DEFINE_EVENT_CONDITION(f2fs__submit_folio_bio, f2fs_submit_folio_write,
TP_PROTO(struct page *page, struct f2fs_io_info *fio),
TP_PROTO(struct folio *folio, struct f2fs_io_info *fio),
TP_ARGS(page, fio),
TP_ARGS(folio, fio),
TP_CONDITION(page->mapping)
TP_CONDITION(folio->mapping)
);
DECLARE_EVENT_CLASS(f2fs__bio,