From nobody Sat Feb 7 15:15:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7AD3C7EE43 for ; Mon, 12 Jun 2023 20:16:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232135AbjFLUQk (ORCPT ); Mon, 12 Jun 2023 16:16:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232336AbjFLUQh (ORCPT ); Mon, 12 Jun 2023 16:16:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2089310CE for ; Mon, 12 Jun 2023 13:16:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B1698620F0 for ; Mon, 12 Jun 2023 20:16:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15A04C433EF; Mon, 12 Jun 2023 20:16:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686600990; bh=IFNcl3Qr1j61HWEFzbLwNkndMDHFIaUy4E04xrmndB0=; h=From:To:Cc:Subject:Date:From; b=IsYOGsxQ+G+xE05S99c1FUqdnyA5A0r8/EhbCRuw0sMxfM3FubILmfAFyp76cq/P7 zptzsxHFMYtBoVTdMsHEzTlfx5nOMGpzYDZcOMVuSxFFO5qlaafRO4cvD+Ur51UHCo LMWALzfw00GkhIrmQLLs1p5fPwVgIX3+bTK4aDMtLrHrv6YubXRfuZkdHHVs8cqYhn mkyexby7SIRqonCAREHNet3KtO304KOyHvkgKcEFngMWEDGSqFTiwpwM/91mFPhBOw Zsf9bKzZE5+ui8xZwBp3TqLbUgLiilTi+xgKwcO6Q/WXX98y57cbfJB49ar+ASFgGf WCFL45smMkm8g== From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: Jaegeuk Kim Subject: [PATCH] f2fs: assign default compression level Date: Mon, 12 Jun 2023 13:16:26 -0700 Message-ID: <20230612201626.3768393-1-jaegeuk@kernel.org> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Let's avoid any confusion from assigning compress_level=3D0 for LZ4HC and Z= STD. Signed-off-by: Jaegeuk Kim --- fs/f2fs/compress.c | 3 +-- fs/f2fs/f2fs.h | 2 ++ fs/f2fs/super.c | 12 +++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index 1132d3cd8f33..438af59d3571 100644 --- a/fs/f2fs/compress.c +++ b/fs/f2fs/compress.c @@ -317,8 +317,6 @@ static const struct f2fs_compress_ops f2fs_lz4_ops =3D { #endif =20 #ifdef CONFIG_F2FS_FS_ZSTD -#define F2FS_ZSTD_DEFAULT_CLEVEL 1 - static int zstd_init_compress_ctx(struct compress_ctx *cc) { zstd_parameters params; @@ -327,6 +325,7 @@ static int zstd_init_compress_ctx(struct compress_ctx *= cc) unsigned int workspace_size; unsigned char level =3D F2FS_I(cc->inode)->i_compress_level; =20 + /* Need to remain this for backward compatibility */ if (!level) level =3D F2FS_ZSTD_DEFAULT_CLEVEL; =20 diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 4b249716ae7b..c61f728e1116 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1440,6 +1440,8 @@ struct compress_data { =20 #define F2FS_COMPRESSED_PAGE_MAGIC 0xF5F2C000 =20 +#define F2FS_ZSTD_DEFAULT_CLEVEL 1 + #define COMPRESS_LEVEL_OFFSET 8 =20 /* compress context */ diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 8fd23caa1ed9..7162e55c4eb4 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -589,14 +589,12 @@ static int f2fs_set_lz4hc_level(struct f2fs_sb_info *= sbi, const char *str) { #ifdef CONFIG_F2FS_FS_LZ4HC unsigned int level; -#endif =20 if (strlen(str) =3D=3D 3) { - F2FS_OPTION(sbi).compress_level =3D 0; + F2FS_OPTION(sbi).compress_level =3D LZ4HC_DEFAULT_CLEVEL; return 0; } =20 -#ifdef CONFIG_F2FS_FS_LZ4HC str +=3D 3; =20 if (str[0] !=3D ':') { @@ -614,6 +612,10 @@ static int f2fs_set_lz4hc_level(struct f2fs_sb_info *s= bi, const char *str) F2FS_OPTION(sbi).compress_level =3D level; return 0; #else + if (strlen(str) =3D=3D 3) { + F2FS_OPTION(sbi).compress_level =3D 0; + return 0; + } f2fs_info(sbi, "kernel doesn't support lz4hc compression"); return -EINVAL; #endif @@ -627,7 +629,7 @@ static int f2fs_set_zstd_level(struct f2fs_sb_info *sbi= , const char *str) int len =3D 4; =20 if (strlen(str) =3D=3D len) { - F2FS_OPTION(sbi).compress_level =3D 0; + F2FS_OPTION(sbi).compress_level =3D F2FS_ZSTD_DEFAULT_CLEVEL; return 0; } =20 @@ -640,7 +642,7 @@ static int f2fs_set_zstd_level(struct f2fs_sb_info *sbi= , const char *str) if (kstrtouint(str + 1, 10, &level)) return -EINVAL; =20 - if (!level || level > zstd_max_clevel()) { + if (level < zstd_min_clevel() || level > zstd_max_clevel()) { f2fs_info(sbi, "invalid zstd compress level: %d", level); return -EINVAL; } --=20 2.41.0.162.gfafddb0af9-goog