Skip to content

Commit

Permalink
f2fs: compress: fix to check unreleased compressed cluster
Browse files Browse the repository at this point in the history
[ Upstream commit eb8fbaa53374e0a2d4381190abfe708481517bbb ]

Compressed cluster may not be released due to we can fail in
release_compress_blocks(), fix to handle reserved compressed
cluster correctly in reserve_compress_blocks().

Fixes: 4c8ff70 ("f2fs: support data compression")
Signed-off-by: Sheng Yong <shengyong@oppo.com>
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Sheng Yong authored and Sasha Levin committed Mar 26, 2024
1 parent 75abfd6 commit d415e1c
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion fs/f2fs/file.c
Expand Up @@ -3631,7 +3631,13 @@ static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count)
goto next;
}

if (__is_valid_data_blkaddr(blkaddr)) {
/*
* compressed cluster was not released due to it
* fails in release_compress_blocks(), so NEW_ADDR
* is a possible case.
*/
if (blkaddr == NEW_ADDR ||
__is_valid_data_blkaddr(blkaddr)) {
compr_blocks++;
continue;
}
Expand All @@ -3641,6 +3647,11 @@ static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count)
}

reserved = cluster_size - compr_blocks;

/* for the case all blocks in cluster were reserved */
if (reserved == 1)
goto next;

ret = inc_valid_block_count(sbi, dn->inode, &reserved);
if (ret)
return ret;
Expand Down

0 comments on commit d415e1c

Please sign in to comment.