f2fs: add parameter @len to f2fs_invalidate_internal_cache()

New function can process some consecutive blocks at a time.

Signed-off-by: Yi Sun <yi.sun@unisoc.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 2ec0cfb41260d95dda2ca511f68ebcea9976e3b0..35b9455fb8999088d761e025fe9d6e85a8db578b 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1414,7 +1414,7 @@ static int __allocate_data_block(struct dnode_of_data *dn, int seg_type)
                return err;
 
        if (GET_SEGNO(sbi, old_blkaddr) != NULL_SEGNO)
-               f2fs_invalidate_internal_cache(sbi, old_blkaddr);
+               f2fs_invalidate_internal_cache(sbi, old_blkaddr, 1);
 
        f2fs_update_data_blkaddr(dn, dn->data_blkaddr);
        return 0;

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index b88e3d1fea9989c2827795a18ef724f6d11d88bd..c537f6b5a4130287de4e64f4144fc2dfa5a2e460 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -4764,10 +4764,10 @@ static inline void f2fs_truncate_meta_inode_pages(struct f2fs_sb_info *sbi,
 }
 
 static inline void f2fs_invalidate_internal_cache(struct f2fs_sb_info *sbi,
-                                                               block_t blkaddr)
+                                               block_t blkaddr, unsigned int len)
 {
-       f2fs_truncate_meta_inode_pages(sbi, blkaddr, 1);
-       f2fs_invalidate_compress_pages_range(sbi, blkaddr, 1);
+       f2fs_truncate_meta_inode_pages(sbi, blkaddr, len);
+       f2fs_invalidate_compress_pages_range(sbi, blkaddr, len);
 }
 
 #define EFSBADCRC      EBADMSG         /* Bad CRC detected */

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 8029369bb71dfebde95c0222ee8399a3bef896eb..faf9fa1c804d76b61f82cfa77f72b0173d38d7e0 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -1415,7 +1415,7 @@ static int move_data_block(struct inode *inode, block_t bidx,
                                page_address(mpage), PAGE_SIZE);
        f2fs_put_page(mpage, 1);
 
-       f2fs_invalidate_internal_cache(fio.sbi, fio.old_blkaddr);
+       f2fs_invalidate_internal_cache(fio.sbi, fio.old_blkaddr, 1);
 
        set_page_dirty(fio.encrypted_page);
        if (clear_page_dirty_for_io(fio.encrypted_page))

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index eade36c5ef138ce5814eb1ff4fce27a72f3224fd..86e547f008f9047d25bc8e3fcd8af72c907af968 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -2537,7 +2537,7 @@ void f2fs_invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr)
        if (addr == NEW_ADDR || addr == COMPRESS_ADDR)
                return;
 
-       f2fs_invalidate_internal_cache(sbi, addr);
+       f2fs_invalidate_internal_cache(sbi, addr, 1);
 
        /* add it into sit main buffer */
        down_write(&sit_i->sentry_lock);
@@ -3857,7 +3857,7 @@ static void do_write_page(struct f2fs_summary *sum, struct f2fs_io_info *fio)
                goto out;
        }
        if (GET_SEGNO(fio->sbi, fio->old_blkaddr) != NULL_SEGNO)
-               f2fs_invalidate_internal_cache(fio->sbi, fio->old_blkaddr);
+               f2fs_invalidate_internal_cache(fio->sbi, fio->old_blkaddr, 1);
 
        /* writeout dirty page into bdev */
        f2fs_submit_page_write(fio);
@@ -4049,7 +4049,7 @@ void f2fs_do_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
                update_sit_entry(sbi, new_blkaddr, 1);
        }
        if (GET_SEGNO(sbi, old_blkaddr) != NULL_SEGNO) {
-               f2fs_invalidate_internal_cache(sbi, old_blkaddr);
+               f2fs_invalidate_internal_cache(sbi, old_blkaddr, 1);
                if (!from_gc)
                        update_segment_mtime(sbi, old_blkaddr, 0);
                update_sit_entry(sbi, old_blkaddr, -1);