From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E963413DB9A; Sun, 24 Mar 2024 23:09:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321785; cv=none; b=sZM+MVpdInjcpWkvV4zZ2SO9RvyQK5nIav9XyKbuTNI0JSeHjxLChtljYO8SiHgG3szY2Poz2eaX6M8mhbwYXeHhxG0/Qn+VtvnC09Muq5jTPp3tCKDrYiGNhJ1YPDzjbFItHhGc6budkjOIkOJgSGS+xwzc369R8goApkV0IvY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321785; c=relaxed/simple; bh=20v7p8yXnB6NUZQzw377e8P7YW4lCPE96iNF/FxfLIA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hJmtnDRGbP6VrltxTYXUykTa/5V7JST9Zstf6SzAoYIJntS+Y5UM7sF/UVxT7J6s9F0H7vDxheaMS5JG4nmriNgez6btg8U7bXSr3YdRDJ/KM+goswMhox6LMhGJMc0GQwyWINZc5YLCz/Mu1C1EN3ab/XVKFnd0dQc/fzV2C8w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fOKISH5D; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fOKISH5D" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18457C433C7; Sun, 24 Mar 2024 23:09:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321783; bh=20v7p8yXnB6NUZQzw377e8P7YW4lCPE96iNF/FxfLIA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fOKISH5D6PZgSi6ndlNmofRRYXHCMMro9oTsAp8pk6lwLeCwLvyjVq43uNcv9IFur X2pkMNjbQKNIr6p7pamuXH8PCbcBYPEU7sPe52INCLQvtb5Lvvb3L6pshXQxFZfq2L sTcWxUqRxeVLHYhjBVlvK0pWUGDMhJ0n3qSsMuZfnDyziCpE46C61yuLMAovDb+WaK 5ZYu4pbDfQtPpKEmSWKTGy39HwCpICCB5a9H31sNdg/FIeYrW0eeAozVkQQijm+ehm 3qStu5vpfC28snzU9BNII3e/pDSKxUsHkI/1g0UHNK5q7VoDJTVtgl0lpFHU/j6POg xkiKePlwbP/oA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sheng Yong , Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 6.6 511/638] f2fs: compress: fix to check unreleased compressed cluster Date: Sun, 24 Mar 2024 18:59:08 -0400 Message-ID: <20240324230116.1348576-512-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324230116.1348576-1-sashal@kernel.org> References: <20240324230116.1348576-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Sheng Yong [ 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 Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/file.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index dcf2d926ab59d..436a59d33c923 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -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; } @@ -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; -- 2.43.0