From patchwork Fri Jan 12 19:41:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 187863 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp584086dyc; Fri, 12 Jan 2024 19:58:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IFHR5C4RxBiKVWIHQZZ9Q4OLRk2SBlSlqYVRT6H237/CMath4/biI0gpZ3jMD7v7mncTcZs X-Received: by 2002:a92:d0cc:0:b0:360:8f4c:482c with SMTP id y12-20020a92d0cc000000b003608f4c482cmr2331872ila.61.1705118290772; Fri, 12 Jan 2024 19:58:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705118290; cv=none; d=google.com; s=arc-20160816; b=eBfgyR6d2mjSnM3BdoHDtO7FyVqjDxoj4NNvVyLOaYdOsIsMGke52Rn6YpYeOLw6YE OKrpO7M2r8wimigkVwbMDxyg20dwbb2SJYKjAKZwZnD1cBvgb1aqGZZ2OuCADJ+VrlJ6 4I1B7XSmINJRGDEr7ILorfcNrnywK3PH7zPEcvWKBxFN075FUeq1vp4qIFO5AIJX4dCF AwLDL9lQn2RhByhVFt08cuGbeT7c66HFwzSXHEqF+2I7SZaa5/7d0yCUQSmGY86HeZzm IeaYxMBgZQxmHyMyWXMYoxINeQe3jMlEjQVTCV9+mUSGcPiIWmhKP5Oub8HDYlCq+4/K OcGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=HUUR43amUC8jwyxGEGINJMRoyp5HU6PI866HjxWnqtE=; fh=2w0/+7CnNSrmHtbae1hR3pLuwOJRubjB5ynbCr7QyGo=; b=XmJDmGrre2ZsCfT+8Dsf7IMkfAAXunz0iUBoVqnftKulTZ4E5ECO/jlT9Fu51mDRkB UbjcRSV6bcsofJk+mOrA9I0eKhbYlzPz/J+8ykmbhy4hh6sAQq1lTBptHPC1Y1eJTWr7 by5FYLP4G+h1HSTrGUrAYYzLvbIYBGvFvlo5pzi74BJtNDBUuUvzPboCgBL6Lefg85JZ KS+xdHy+be3hyfM77rzlgIvDHlkMVdg9T3BxjssM1425xb1QVNuKb9fvqHmSxtgDf5RC 4vuo5ht2K5GjeGJ6negqipXIaOktzK8bpkLkKzEmDNlK1tJM/2Yk/qPCe0QM40sP0z6B uYbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="syf/atgs"; spf=pass (google.com: domain of linux-kernel+bounces-25188-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25188-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id jv21-20020a170903059500b001d55aaeb305si4276029plb.423.2024.01.12.19.58.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jan 2024 19:58:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-25188-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="syf/atgs"; spf=pass (google.com: domain of linux-kernel+bounces-25188-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25188-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 8C4C22870D3 for ; Sat, 13 Jan 2024 03:58:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E970B1944E; Sat, 13 Jan 2024 03:57:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="syf/atgs" 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 4BA50F9EB for ; Sat, 13 Jan 2024 03:57:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78372C43330; Sat, 13 Jan 2024 03:57:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705118245; bh=RQ/5bYxkS3MyNG96Qf/wOP3mhXKTcQQqJW6nVAGR5yE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=syf/atgsKYI3WxMH06ywnV/Te/ggAxXMNSL4DKHuokLI71CB4OwWpBcIULcF+qcU2 fe28JdWhS0wGi29VFqMPcUzHiCDGofP9ZlpJXuZ3japDp8q3LYxzfEBK7FJBQUfkoP 9SzmGPqL9uyjV3Sa+gY1NAMoNGxfugggb5ubfC7rVxEDAedZP3dvjjj0IdiLzrOmFk HOxJnBIkX+PAloeuTF9rtEBs7BBCGY9VnUUoH8KBtE4oqTzfmAQ3ulQCvLdMou6hYE hL8fIb/Yc39UIsnzqjNcHj114X1NpTDJq1vNLvFFQyIUF0AhiIcS0x+XA5HesD/Klb 2PZr3VULR85Pw== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Sheng Yong , Chao Yu Subject: [PATCH v5 3/6] f2fs: compress: fix to check unreleased compressed cluster Date: Sat, 13 Jan 2024 03:41:29 +0800 Message-Id: <20240112194132.25637-3-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240112194132.25637-1-chao@kernel.org> References: <20240112194132.25637-1-chao@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787946116972485345 X-GMAIL-MSGID: 1787946116972485345 From: Sheng Yong 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 --- v5: - fix wrong condition pointed out by Daeho. 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 026d05a7edd8..4aef2310395f 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;