History

erofs: simplify z_erofs_pcluster_readmore()

Get rid of unnecessary label `skip'. No logic changes.

Gao Xiang committed 4 years ago

Commit aa793b41 parent 39397a41 file · +10 −13Browse files

Unified · Split

fs/erofs/zdata.c+10−13
@@ -1436,22 +1436,19 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f, · 1435 unmodified lines
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;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t