f2fs: compress: fix to check unreleased compressed cluster

[ 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: 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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 46e4960a9dcf749f166500d7add0e5f9dd0bcdb6..6c9f03e3be8e979b0ce2f62831b76cb70e076ee9 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -3609,7 +3609,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;
                        }
@@ -3619,6 +3625,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;