f2fs: introduce map_is_mergeable() for cleanup

No logic changes.

Signed-off-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 d9494b5fc7c185e5088dd12885a5e9758cfd4011..08815394223a3eae568f4253b1c35e7e1c77521d 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1507,6 +1507,22 @@ static bool f2fs_map_blocks_cached(struct inode *inode,
        return true;
 }
 
+static bool map_is_mergeable(struct f2fs_sb_info *sbi,
+                               struct f2fs_map_blocks *map,
+                               block_t blkaddr, int flag, int bidx,
+                               int ofs)
+{
+       if (map->m_multidev_dio && map->m_bdev != FDEV(bidx).bdev)
+               return false;
+       if (map->m_pblk != NEW_ADDR && blkaddr == (map->m_pblk + ofs))
+               return true;
+       if (map->m_pblk == NEW_ADDR && blkaddr == NEW_ADDR)
+               return true;
+       if (flag == F2FS_GET_BLOCK_PRE_DIO)
+               return true;
+       return false;
+}
+
 /*
  * f2fs_map_blocks() tries to find or build mapping relationship which
  * maps continuous logical blocks to physical blocks, and return such
@@ -1653,12 +1669,7 @@ next_block:
 
                if (map->m_multidev_dio)
                        map->m_bdev = FDEV(bidx).bdev;
-       } else if ((map->m_pblk != NEW_ADDR &&
-                       blkaddr == (map->m_pblk + ofs)) ||
-                       (map->m_pblk == NEW_ADDR && blkaddr == NEW_ADDR) ||
-                       flag == F2FS_GET_BLOCK_PRE_DIO) {
-               if (map->m_multidev_dio && map->m_bdev != FDEV(bidx).bdev)
-                       goto sync_out;
+       } else if (map_is_mergeable(sbi, map, blkaddr, flag, bidx, ofs)) {
                ofs++;
                map->m_len++;
        } else {