]> git.baikalelectronics.ru Git - kernel.git/commitdiff
erofs: simplify z_erofs_pcluster_readmore()
authorGao Xiang <hsiangkao@linux.alibaba.com>
Sun, 29 May 2022 05:54:25 +0000 (13:54 +0800)
committerGao Xiang <hsiangkao@linux.alibaba.com>
Tue, 31 May 2022 15:15:21 +0000 (23:15 +0800)
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>
fs/erofs/zdata.c

index 6dd858f94e44636ef2e4c21c90e466a91a9f7075..b33fb64b33932e3c08e5a37e72009f6c593d4be8 100644 (file)
@@ -1436,22 +1436,19 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f,
                struct page *page;
 
                page = erofs_grab_cache_page_nowait(inode->i_mapping, index);
-               if (!page)
-                       goto skip;
-
-               if (PageUptodate(page)) {
-                       unlock_page(page);
+               if (page) {
+                       if (PageUptodate(page)) {
+                               unlock_page(page);
+                       } else {
+                               err = z_erofs_do_read_page(f, page, pagepool);
+                               if (err)
+                                       erofs_err(inode->i_sb,
+                                                 "readmore error at page %lu @ nid %llu",
+                                                 index, EROFS_I(inode)->nid);
+                       }
                        put_page(page);
-                       goto skip;
                }
 
-               err = z_erofs_do_read_page(f, page, pagepool);
-               if (err)
-                       erofs_err(inode->i_sb,
-                                 "readmore error at page %lu @ nid %llu",
-                                 index, EROFS_I(inode)->nid);
-               put_page(page);
-skip:
                if (cur < PAGE_SIZE)
                        break;
                cur = (index << PAGE_SHIFT) - 1;