f2fs: introduce f2fs_invalidate_internal_cache() for cleanup

[ Upstream commit 4e4f1eb9949b10cb7d76370fd27d41f20ef2b32b ]

Just cleanup, no logic changes.

Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Stable-dep-of: 9f0c4a46be1f ("f2fs: fix to truncate meta inode pages forcely")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 7cfa6e4da560c72d0c9560bb2be8958646541507..5805b77d925e34f7d9b9611aace3b3bcc90e19f9 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1485,11 +1485,9 @@ static int __allocate_data_block(struct dnode_of_data *dn, int seg_type)
        old_blkaddr = dn->data_blkaddr;
        f2fs_allocate_data_block(sbi, NULL, old_blkaddr, &dn->data_blkaddr,
                                &sum, seg_type, NULL);
-       if (GET_SEGNO(sbi, old_blkaddr) != NULL_SEGNO) {
-               invalidate_mapping_pages(META_MAPPING(sbi),
-                                       old_blkaddr, old_blkaddr);
-               f2fs_invalidate_compress_page(sbi, old_blkaddr);
-       }
+       if (GET_SEGNO(sbi, old_blkaddr) != NULL_SEGNO)
+               f2fs_invalidate_internal_cache(sbi, old_blkaddr);
+
        f2fs_update_data_blkaddr(dn, dn->data_blkaddr);
        return 0;
 }

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 54311765df373b3cd7c9738a7e89fbc10b6a5b74..bf4a7f98e34769caf13fec223c79e7f9356d7152 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -4625,6 +4625,13 @@ static inline bool f2fs_is_readonly(struct f2fs_sb_info *sbi)
        return f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb);
 }
 
+static inline void f2fs_invalidate_internal_cache(struct f2fs_sb_info *sbi,
+                                                               block_t blkaddr)
+{
+       invalidate_mapping_pages(META_MAPPING(sbi), blkaddr, blkaddr);
+       f2fs_invalidate_compress_page(sbi, blkaddr);
+}
+
 #define EFSBADCRC      EBADMSG         /* Bad CRC detected */
 #define EFSCORRUPTED   EUCLEAN         /* Filesystem is corrupted */
 

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 2fbe16ad726f457dee71e7d1b5d67893d04aa884..405a6077bd83bd90773a7efb02b6684a3aaa6ff2 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -1380,9 +1380,8 @@ static int move_data_block(struct inode *inode, block_t bidx,
        memcpy(page_address(fio.encrypted_page),
                                page_address(mpage), PAGE_SIZE);
        f2fs_put_page(mpage, 1);
-       invalidate_mapping_pages(META_MAPPING(fio.sbi),
-                               fio.old_blkaddr, fio.old_blkaddr);
-       f2fs_invalidate_compress_page(fio.sbi, fio.old_blkaddr);
+
+       f2fs_invalidate_internal_cache(fio.sbi, fio.old_blkaddr);
 
        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 e995823d271f61e323c0c36181e34288a361f27d..311769872b84ecccb3a9210f8b087f1ed8e882f7 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -2495,8 +2495,7 @@ void f2fs_invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr)
        if (addr == NEW_ADDR || addr == COMPRESS_ADDR)
                return;
 
-       invalidate_mapping_pages(META_MAPPING(sbi), addr, addr);
-       f2fs_invalidate_compress_page(sbi, addr);
+       f2fs_invalidate_internal_cache(sbi, addr);
 
        /* add it into sit main buffer */
        down_write(&sit_i->sentry_lock);
@@ -3557,11 +3556,8 @@ static void do_write_page(struct f2fs_summary *sum, struct f2fs_io_info *fio)
 reallocate:
        f2fs_allocate_data_block(fio->sbi, fio->page, fio->old_blkaddr,
                        &fio->new_blkaddr, sum, type, fio);
-       if (GET_SEGNO(fio->sbi, fio->old_blkaddr) != NULL_SEGNO) {
-               invalidate_mapping_pages(META_MAPPING(fio->sbi),
-                                       fio->old_blkaddr, fio->old_blkaddr);
-               f2fs_invalidate_compress_page(fio->sbi, fio->old_blkaddr);
-       }
+       if (GET_SEGNO(fio->sbi, fio->old_blkaddr) != NULL_SEGNO)
+               f2fs_invalidate_internal_cache(fio->sbi, fio->old_blkaddr);
 
        /* writeout dirty page into bdev */
        f2fs_submit_page_write(fio);
@@ -3757,9 +3753,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) {
-               invalidate_mapping_pages(META_MAPPING(sbi),
-                                       old_blkaddr, old_blkaddr);
-               f2fs_invalidate_compress_page(sbi, old_blkaddr);
+               f2fs_invalidate_internal_cache(sbi, old_blkaddr);
                if (!from_gc)
                        update_segment_mtime(sbi, old_blkaddr, 0);
                update_sit_entry(sbi, old_blkaddr, -1);