Commit ba9ce771 authored by Gao Xiang's avatar Gao Xiang Committed by Greg Kroah-Hartman

staging: erofs: fix `trace_erofs_readpage' position

`trace_erofs_readpage' was designed for .readpage() interface hook
in order to trace the detailed synchronized read rather than
the internal implementation `z_erofs_do_read_page' which both
.readpage() and .readpages() use.

It seems the tracepoint was placed to a wrong place by mistake and
it should be moved to the right place.

Fixes: 284db12c ("staging: erofs: add trace points for reading zipped data")
Reviewed-by: default avatarChen Gong <gongchen4@huawei.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarGao Xiang <gaoxiang25@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e3bc2b0
...@@ -598,8 +598,6 @@ static int z_erofs_do_read_page(struct z_erofs_vle_frontend *fe, ...@@ -598,8 +598,6 @@ static int z_erofs_do_read_page(struct z_erofs_vle_frontend *fe,
unsigned int cur, end, spiltted, index; unsigned int cur, end, spiltted, index;
int err = 0; int err = 0;
trace_erofs_readpage(page, false);
/* register locked file pages as online pages in pack */ /* register locked file pages as online pages in pack */
z_erofs_onlinepage_init(page); z_erofs_onlinepage_init(page);
...@@ -1288,6 +1286,8 @@ static int z_erofs_vle_normalaccess_readpage(struct file *file, ...@@ -1288,6 +1286,8 @@ static int z_erofs_vle_normalaccess_readpage(struct file *file,
int err; int err;
LIST_HEAD(pagepool); LIST_HEAD(pagepool);
trace_erofs_readpage(page, false);
#if (EROFS_FS_ZIP_CACHE_LVL >= 2) #if (EROFS_FS_ZIP_CACHE_LVL >= 2)
f.cachedzone_la = (erofs_off_t)page->index << PAGE_SHIFT; f.cachedzone_la = (erofs_off_t)page->index << PAGE_SHIFT;
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment