Re: [f2fs-dev] [PATCH 1/2] f2fs: introduce map_is_mergeable() for cleanup

[patchwork-bot+f2fs]

Hello:

This series was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim :

On Mon, 25 Mar 2024 23:27:25 +0800 you wrote:
> No logic changes.
> 
> Signed-off-by: Chao Yu 
> ---
>  fs/f2fs/data.c | 24 ++--
>  1 file changed, 18 insertions(+), 6 deletions(-)

Here is the summary with links:
  - [f2fs-dev,1/2] f2fs: introduce map_is_mergeable() for cleanup
(no matching commit)
  - [f2fs-dev,2/2] f2fs: support to map continuous holes or preallocated address
https://git.kernel.org/jaegeuk/f2fs/c/9f0f6bf42714

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html




___
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

[f2fs-dev] [PATCH 1/2] f2fs: introduce map_is_mergeable() for cleanup

[Chao Yu]

No logic changes.

Signed-off-by: Chao Yu 
---
 fs/f2fs/data.c | 24 ++--
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 5ef1874b572a..9c000ca4f808 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1507,6 +1507,23 @@ 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 +1670,7 @@ int f2fs_map_blocks(struct inode *inode, struct 
f2fs_map_blocks *map, int flag)
 
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 {
-- 
2.40.1



___
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel