Skip to content

Commit aa793b4

Browse files
committed
erofs: simplify z_erofs_pcluster_readmore()
Get rid of unnecessary label `skip'. No logic changes. Link: https://lore.kernel.org/r/20220529055425.226363-4-xiang@kernel.org Acked-by: Chao Yu <chao@kernel.org> Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
1 parent 39397a4 commit aa793b4

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

fs/erofs/zdata.c

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,22 +1436,19 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f,
14361436
struct page *page;
14371437

14381438
page = erofs_grab_cache_page_nowait(inode->i_mapping, index);
1439-
if (!page)
1440-
goto skip;
1441-
1442-
if (PageUptodate(page)) {
1443-
unlock_page(page);
1439+
if (page) {
1440+
if (PageUptodate(page)) {
1441+
unlock_page(page);
1442+
} else {
1443+
err = z_erofs_do_read_page(f, page, pagepool);
1444+
if (err)
1445+
erofs_err(inode->i_sb,
1446+
"readmore error at page %lu @ nid %llu",
1447+
index, EROFS_I(inode)->nid);
1448+
}
14441449
put_page(page);
1445-
goto skip;
14461450
}
14471451

1448-
err = z_erofs_do_read_page(f, page, pagepool);
1449-
if (err)
1450-
erofs_err(inode->i_sb,
1451-
"readmore error at page %lu @ nid %llu",
1452-
index, EROFS_I(inode)->nid);
1453-
put_page(page);
1454-
skip:
14551452
if (cur < PAGE_SIZE)
14561453
break;
14571454
cur = (index << PAGE_SHIFT) - 1;

0 commit comments

Comments
 (0)