summaryrefslogtreecommitdiffstats
path: root/fs/f2fs/file.c
diff options
context:
space:
mode:
authorSheng Yong <shengyong@oppo.com>2024-01-13 03:41:29 +0800
committerJaegeuk Kim <jaegeuk@kernel.org>2024-02-05 18:58:39 -0800
commiteb8fbaa53374e0a2d4381190abfe708481517bbb (patch)
tree3d7865d0d14343f2a2b5d8ac61863ece1dfa22a7 /fs/f2fs/file.c
parentfd244524c2cf07b5f4c3fe8abd6a99225c76544b (diff)
downloadlinux-eb8fbaa53374e0a2d4381190abfe708481517bbb.tar.gz
linux-eb8fbaa53374e0a2d4381190abfe708481517bbb.tar.bz2
linux-eb8fbaa53374e0a2d4381190abfe708481517bbb.zip
f2fs: compress: fix to check unreleased compressed cluster
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: 4c8ff7095bef ("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>
Diffstat (limited to 'fs/f2fs/file.c')
-rw-r--r--fs/f2fs/file.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index b58ab1157b7e..941e02c0953c 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -3624,7 +3624,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;
}
@@ -3633,6 +3639,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;