staging: erofs: fix `trace_erofs_readpage' position
authorGao Xiang <gaoxiang25@huawei.com>
Thu, 22 Nov 2018 17:15:58 +0000 (01:15 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 Nov 2018 09:53:07 +0000 (10:53 +0100)
`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: 284db12cfda3 ("staging: erofs: add trace points for reading zipped data")
Reviewed-by: Chen Gong <gongchen4@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/erofs/unzip_vle.c

index 6a283f618f4695add25131705540622296953008..ede3383ac601f04153b55616a35c86260a4561be 100644 (file)
@@ -598,8 +598,6 @@ static int z_erofs_do_read_page(struct z_erofs_vle_frontend *fe,
        unsigned int cur, end, spiltted, index;
        int err = 0;
 
-       trace_erofs_readpage(page, false);
-
        /* register locked file pages as online pages in pack */
        z_erofs_onlinepage_init(page);
 
@@ -1288,6 +1286,8 @@ static int z_erofs_vle_normalaccess_readpage(struct file *file,
        int err;
        LIST_HEAD(pagepool);
 
+       trace_erofs_readpage(page, false);
+
 #if (EROFS_FS_ZIP_CACHE_LVL >= 2)
        f.cachedzone_la = (erofs_off_t)page->index << PAGE_SHIFT;
 #endif