f2fs: introduce ra_meta_pages to readahead CP/NAT/SIT pages

This patch help us to cleanup the readahead code by merging ra_{sit,nat}_pages
function into ra_meta_pages.
Additionally the new function is used to readahead cp block in
recover_orphan_inodes.

Change log from v1:
 o fix a deadloop bug pointed by Jaegeuk Kim.

Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>

1 files changed, 1 insertions, 42 deletions

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index e87946a08a21..fbb41ba818fd 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1576,47 +1576,6 @@ static int build_curseg(struct f2fs_sb_info *sbi)
         return restore_curseg_summaries(sbi);
 }
 
-static int ra_sit_pages(struct f2fs_sb_info *sbi, int start, int nrpages)
-{
-        struct address_space *mapping = META_MAPPING(sbi);
-        struct page *page;
-        block_t blk_addr, prev_blk_addr = 0;
-        int sit_blk_cnt = SIT_BLK_CNT(sbi);
-        int blkno = start;
-        struct f2fs_io_info fio = {
-                .type = META,
-                .rw = READ_SYNC | REQ_META | REQ_PRIO
-        };
-
-        for (; blkno < start + nrpages && blkno < sit_blk_cnt; blkno++) {
-
-                blk_addr = current_sit_addr(sbi, blkno * SIT_ENTRY_PER_BLOCK);
-
-                if (blkno != start && prev_blk_addr + 1 != blk_addr)
-                        break;
-                prev_blk_addr = blk_addr;
-repeat:
-                page = grab_cache_page(mapping, blk_addr);
-                if (!page) {
-                        cond_resched();
-                        goto repeat;
-                }
-                if (PageUptodate(page)) {
-                        mark_page_accessed(page);
-                        f2fs_put_page(page, 1);
-                        continue;
-                }
-
-                f2fs_submit_page_mbio(sbi, page, blk_addr, &fio);
-
-                mark_page_accessed(page);
-                f2fs_put_page(page, 0);
-        }
-
-        f2fs_submit_merged_bio(sbi, META, READ);
-        return blkno - start;
-}
-
 static void build_sit_entries(struct f2fs_sb_info *sbi)
 {
         struct sit_info *sit_i = SIT_I(sbi);
@@ -1628,7 +1587,7 @@ static void build_sit_entries(struct f2fs_sb_info *sbi)
         int nrpages = MAX_BIO_BLOCKS(max_hw_blocks(sbi));
 
         do {
-                readed = ra_sit_pages(sbi, start_blk, nrpages);
+                readed = ra_meta_pages(sbi, start_blk, nrpages, META_SIT);
 
                 start = start_blk * sit_i->sents_per_block;
                 end = (start_blk + readed) * sit_i->sents_per_block;