torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-22 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

erofs: pass inode to trace_erofs_read_folio

Browse Source 
The trace_erofs_read_folio accesses inode information through folio,
but this method fails if the real inode is not associated with the
folio(such as in the upcoming page cache sharing case). Therefore,
we pass the real inode to it so that the inode information can be
printed out in that case.

Signed-off-by: Hongbo Li <lihongbo22@huawei.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
This commit is contained in:
Hongbo Li
2026-01-23 01:31:29 +00:00
committed by Gao Xiang
parent 5ef3208e3b
commit 69368d2ded
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/erofs/data.c
View File

@@ -385,8 +385,7 @@ static int erofs_read_folio(struct file *file, struct folio *folio)
};
struct erofs_iomap_iter_ctx iter_ctx = {};
trace_erofs_read_folio(folio, true);
trace_erofs_read_folio(folio_inode(folio), folio, true);
iomap_read_folio(&erofs_iomap_ops, &read_ctx, &iter_ctx);
return 0;
}
@@ -400,8 +399,7 @@ static void erofs_readahead(struct readahead_control *rac)
struct erofs_iomap_iter_ctx iter_ctx = {};
trace_erofs_readahead(rac->mapping->host, readahead_index(rac),
readahead_count(rac), true);
readahead_count(rac), true);
iomap_readahead(&erofs_iomap_ops, &read_ctx, &iter_ctx);
}

2
fs/erofs/fileio.c
View File

@@ -161,7 +161,7 @@ static int erofs_fileio_read_folio(struct file *file, struct folio *folio)
struct erofs_fileio io = {};
int err;
trace_erofs_read_folio(folio, true);
trace_erofs_read_folio(folio_inode(folio), folio, true);
err = erofs_fileio_scan_folio(&io, folio);
erofs_fileio_rq_submit(io.rq);
return err;

2
fs/erofs/zdata.c
View File

@@ -1879,7 +1879,7 @@ static int z_erofs_read_folio(struct file *file, struct folio *folio)
Z_EROFS_DEFINE_FRONTEND(f, inode, folio_pos(folio));
int err;
trace_erofs_read_folio(folio, false);
trace_erofs_read_folio(inode, folio, false);
z_erofs_pcluster_readmore(&f, NULL, true);
err = z_erofs_scan_folio(&f, folio, false);
z_erofs_pcluster_readmore(&f, NULL, false);

10
include/trace/events/erofs.h
View File

@@ -82,9 +82,9 @@ TRACE_EVENT(erofs_fill_inode,
TRACE_EVENT(erofs_read_folio,
TP_PROTO(struct folio *folio, bool raw),
TP_PROTO(struct inode *inode, struct folio *folio, bool raw),
TP_ARGS(folio, raw),
TP_ARGS(inode, folio, raw),
TP_STRUCT__entry(
__field(dev_t, dev )
@@ -96,9 +96,9 @@ TRACE_EVENT(erofs_read_folio,
),
TP_fast_assign(
__entry->dev = folio->mapping->host->i_sb->s_dev;
__entry->nid = EROFS_I(folio->mapping->host)->nid;
__entry->dir = S_ISDIR(folio->mapping->host->i_mode);
__entry->dev = inode->i_sb->s_dev;
__entry->nid = EROFS_I(inode)->nid;
__entry->dir = S_ISDIR(inode->i_mode);
__entry->index = folio->index;
__entry->uptodate = folio_test_uptodate(folio);
__entry->raw = raw;