Commit e3157bb5 authored by Ferry Meng's avatar Ferry Meng Committed by Gao Xiang

erofs: refine warning messages for zdata I/Os

Don't warn users since -EINTR can be returned due to user interruption.
Also suppress warning messages of readmore.
Signed-off-by: default avatarFerry Meng <mengferry@linux.alibaba.com>
Reviewed-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: default avatarYue Hu <huyue2@coolpad.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Link: https://lore.kernel.org/r/20230809060637.21311-1-mengferry@linux.alibaba.comSigned-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
parent fd73a439
...@@ -1848,15 +1848,10 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f, ...@@ -1848,15 +1848,10 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f,
page = erofs_grab_cache_page_nowait(inode->i_mapping, index); page = erofs_grab_cache_page_nowait(inode->i_mapping, index);
if (page) { if (page) {
if (PageUptodate(page)) { if (PageUptodate(page))
unlock_page(page); unlock_page(page);
} else { else
err = z_erofs_do_read_page(f, page); (void)z_erofs_do_read_page(f, page);
if (err)
erofs_err(inode->i_sb,
"readmore error at page %lu @ nid %llu",
index, EROFS_I(inode)->nid);
}
put_page(page); put_page(page);
} }
...@@ -1885,8 +1880,9 @@ static int z_erofs_read_folio(struct file *file, struct folio *folio) ...@@ -1885,8 +1880,9 @@ static int z_erofs_read_folio(struct file *file, struct folio *folio)
/* if some compressed cluster ready, need submit them anyway */ /* if some compressed cluster ready, need submit them anyway */
z_erofs_runqueue(&f, z_erofs_is_sync_decompress(sbi, 0), false); z_erofs_runqueue(&f, z_erofs_is_sync_decompress(sbi, 0), false);
if (err) if (err && err != -EINTR)
erofs_err(inode->i_sb, "failed to read, err [%d]", err); erofs_err(inode->i_sb, "read error %d @ %lu of nid %llu",
err, folio->index, EROFS_I(inode)->nid);
erofs_put_metabuf(&f.map.buf); erofs_put_metabuf(&f.map.buf);
erofs_release_pages(&f.pagepool); erofs_release_pages(&f.pagepool);
...@@ -1920,10 +1916,9 @@ static void z_erofs_readahead(struct readahead_control *rac) ...@@ -1920,10 +1916,9 @@ static void z_erofs_readahead(struct readahead_control *rac)
head = (void *)page_private(page); head = (void *)page_private(page);
err = z_erofs_do_read_page(&f, page); err = z_erofs_do_read_page(&f, page);
if (err) if (err && err != -EINTR)
erofs_err(inode->i_sb, erofs_err(inode->i_sb, "readahead error %d @ %lu of nid %llu",
"readahead error at page %lu @ nid %llu", err, page->index, EROFS_I(inode)->nid);
page->index, EROFS_I(inode)->nid);
put_page(page); put_page(page);
} }
z_erofs_pcluster_readmore(&f, rac, false); z_erofs_pcluster_readmore(&f, rac, false);
......
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