Commit eb8fbaa5 authored by Sheng Yong's avatar Sheng Yong Committed by Jaegeuk Kim
Browse files

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: 4c8ff709 ("f2fs: support data compression")
Signed-off-by: default avatarSheng Yong <shengyong@oppo.com>
Signed-off-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent fd244524

fs/f2fs/file.c

+12 −1
Original line number Diff line number Diff line
@@ -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;