erofs: refine warning messages for zdata I/Os
authorFerry Meng <mengferry@linux.alibaba.com>
Wed, 9 Aug 2023 06:06:37 +0000 (14:06 +0800)
committerGao Xiang <hsiangkao@linux.alibaba.com>
Wed, 23 Aug 2023 15:39:01 +0000 (23:39 +0800)
Don't warn users since -EINTR can be returned due to user interruption.
Also suppress warning messages of readmore.

Signed-off-by: Ferry Meng <mengferry@linux.alibaba.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: Yue Hu <huyue2@coolpad.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Link: https://lore.kernel.org/r/20230809060637.21311-1-mengferry@linux.alibaba.com
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
fs/erofs/zdata.c

index de4f121..5382027 100644 (file)
@@ -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);
                if (page) {
-                       if (PageUptodate(page)) {
+                       if (PageUptodate(page))
                                unlock_page(page);
-                       } else {
-                               err = 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);
-                       }
+                       else
+                               (void)z_erofs_do_read_page(f, page);
                        put_page(page);
                }
 
@@ -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 */
        z_erofs_runqueue(&f, z_erofs_is_sync_decompress(sbi, 0), false);
 
-       if (err)
-               erofs_err(inode->i_sb, "failed to read, err [%d]", err);
+       if (err && err != -EINTR)
+               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_release_pages(&f.pagepool);
@@ -1920,10 +1916,9 @@ static void z_erofs_readahead(struct readahead_control *rac)
                head = (void *)page_private(page);
 
                err = z_erofs_do_read_page(&f, page);
-               if (err)
-                       erofs_err(inode->i_sb,
-                                 "readahead error at page %lu @ nid %llu",
-                                 page->index, EROFS_I(inode)->nid);
+               if (err && err != -EINTR)
+                       erofs_err(inode->i_sb, "readahead error %d @ %lu of nid %llu",
+                                 err, page->index, EROFS_I(inode)->nid);
                put_page(page);
        }
        z_erofs_pcluster_readmore(&f, rac, false);