From:   Yangtao Li <frank.li@vivo.com>
To:     jaegeuk@kernel.org, chao@kernel.org
Cc:     linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org, Yangtao Li <frank.li@vivo.com>
Subject: [PATCH 1/4] f2fs: fix to check lz4hc compression when CONFIG_F2FS_FS_LZ4HC is not enabled
Date:   Tue, 24 Jan 2023 23:33:43 +0800
Message-Id: <20230124153346.74881-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ai6EbR4W5iV+luRASWxrMOrzZJqLpY6ZKHtnqutJFN+eW1e3nRaymfrnXYCV?=
 =?us-ascii?Q?h0PvnE+klPVmUsXrzI+4EIlrU8D/LnAJOUzBfRJgz1Pb+sLYuigPYqimWqrO?=
 =?us-ascii?Q?3blED057S9hLaNnVKxRXaWveDjUiQLKbGwaV+UwU8NqpOMXt1VJZ7E7MOelr?=
 =?us-ascii?Q?AuM35L9O22Yuve0yIxEVAkf31ROQhqL/Ssm79chELdNrCeqTsjXqBrctMQHR?=
 =?us-ascii?Q?HycFaELD74Ef9s/MS9TsldHVWMylw9tUdKXEIs5Z7t2EZ86S+GBJg0OFyb1/?=
 =?us-ascii?Q?23mIkHaUN0KoGZVkqJPqszv259ne0euTQuKeU/p5jUpipE6nvWqspB7NwxD+?=
 =?us-ascii?Q?8ik7ta8XN9gaUrU9W4enVJ8zTR8+KMZGsqFfC7g636x4A+/1snyKLtWQe4IQ?=
 =?us-ascii?Q?WQbOLK5Whrld6x+kjd9LBKhHngILsnrE6yK4GQExMp5OQvXq+JSWR61UTLLi?=
 =?us-ascii?Q?LGsZnL1Ippa905OCBjoepgLddPE10CGzojnxVIUHD9kQyoE1Ma5rzIsYx6wC?=
 =?us-ascii?Q?ZHKDdw9wa19kyJ9MjsSgS6nS1BaLCfpgpCWBUorwo6o3aANR3uKUrwRc0wj3?=
 =?us-ascii?Q?mHW4vGQeyyULZJsDnQTVBJ0XJ6hcsh8zR/uI0E6tp58vyNP4qNBplK2AIyc5?=
 =?us-ascii?Q?lXuO1g6/B0KYs4bTarxTb5AmcG3aXCDEhvaTaM8QxhlfXnGSGdZmDf64dyH6?=
 =?us-ascii?Q?98FX25VUZ7Ie4OpjThOA6gWjqLb9QbnDv6gNJNHO+9BgkvqADLyQI0ppa6QH?=
 =?us-ascii?Q?Oi47A3uHU+i0VZe/wt/iPrEbCDf9dbxy6j8Njm1yPr99vy+s4yKWTj2QkDHO?=
 =?us-ascii?Q?9KoSvZzf1DAbBDhJ1NKwg0JpuWJLffSl/CsygFpSJru5nIdGmg50MbVE5gM/?=
 =?us-ascii?Q?LKjjb51mY4jlF1njlt3pbNyhkhU6wsV57Yj2lZUdeSHdSYS70yuT+mSwnMkC?=
 =?us-ascii?Q?r/6OIyBM0XpMQzm/YyF+aw+MBkm6Qe8yDHxjxuFF8lMj42EDuNX5vnYFYjk2?=
 =?us-ascii?Q?FD/j438Znlg7lZi6DmnXqPYJY8aeCFB1oMK2hODiV9St8h1IsmoVm7WO2C/A?=
 =?us-ascii?Q?hqGOkf18/3UBZOyo90OCzMl1ZJeLBwu6xc4Dfbbmv/aO59j3lIG5y71YjPHp?=
 =?us-ascii?Q?qoslzYaP0/v+HuAnV/SCNanlkpjAnO5L7MS9hIEovXomdEUx0L/JfuOJU4rJ?=
 =?us-ascii?Q?OlMiUaeQv+TFwvr/smQBssN3ypcXqgiS0YTFbQEYHyJkc3FuOoF8NtUYAa5A?=
 =?us-ascii?Q?m81A/tQCX/tjaYlsEjB5qdiCIOJp3aQU9AlE6uBbQ91VXGsDYUD9EGBchOuO?=
 =?us-ascii?Q?gMGmVbD9DNeQ/U995YLxWXxWcYXqplNerO4cZxZggE7uvENhKSnTF7LmNkad?=
 =?us-ascii?Q?i+rV97bpfWt+3dZeOzh9GiZoYtSsWXijTsxOBVW5PJTuq2WO4uuoFijhTNIU?=
 =?us-ascii?Q?I0ioU6gJ8FtEcrYDa7AQKsnHBrtsYJEZqkLQ0vPtDskOyfflKq8OjS8XSg8Z?=
 =?us-ascii?Q?OcrrvxWVPSgIt8pQ+PKJV4lI+RVUChOftaZl50m0b7aFxIvWaur0g6C7BSdm?=
 =?us-ascii?Q?If3oWgOPJv/dpgoDQ65AnW3uu45iV2JC74ayIOcm?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b6084881-f20c-4562-0f25-08dafe20683f
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 15:33:56.9905
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Nd7t5/xm9sKV26iNJSRydXkP2u8ct9mbskUA6JyQmTCUNAMRmq3fkg3Ketxm77zrffT1aVVex7V/pOakxlMVnw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB5019
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

f2fs supports lz4 compression algorithm and lz4hc compression algorithm,
which the level parameter needs to be passed in. When CONFIG_F2FS_FS_LZ4HC
is not enabled, even if there is no problem with the level parameter, add
the level parameter to the lz4 algorithm will cause the mount to fail.

Let's change it to be the same as other compression algorithms. When the
kernel does not enable the algorithm, ignore this parameter and print msg.

Fixes: 3fde13f817e2 ("f2fs: compress: support compress level")
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/super.c | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index d8a65645ee48..ad5df4d5c39a 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -588,19 +588,11 @@ static int f2fs_test_compress_extension(struct f2fs_sb_info *sbi)
 	return 0;
 }
 
-#ifdef CONFIG_F2FS_FS_LZ4
+#ifdef CONFIG_F2FS_FS_LZ4HC
 static int f2fs_set_lz4hc_level(struct f2fs_sb_info *sbi, const char *str)
 {
-#ifdef CONFIG_F2FS_FS_LZ4HC
 	unsigned int level;
-#endif
 
-	if (strlen(str) == 3) {
-		F2FS_OPTION(sbi).compress_level = 0;
-		return 0;
-	}
-
-#ifdef CONFIG_F2FS_FS_LZ4HC
 	str += 3;
 
 	if (str[0] != ':') {
@@ -617,10 +609,6 @@ static int f2fs_set_lz4hc_level(struct f2fs_sb_info *sbi, const char *str)
 
 	F2FS_OPTION(sbi).compress_level = level;
 	return 0;
-#else
-	f2fs_info(sbi, "kernel doesn't support lz4hc compression");
-	return -EINVAL;
-#endif
 }
 #endif
 
@@ -1085,10 +1073,19 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 #endif
 			} else if (!strncmp(name, "lz4", 3)) {
 #ifdef CONFIG_F2FS_FS_LZ4
-				ret = f2fs_set_lz4hc_level(sbi, name);
-				if (ret) {
-					kfree(name);
-					return -EINVAL;
+				if (strlen(name) == 3) {
+					F2FS_OPTION(sbi).compress_level = 0;
+				} else {
+#ifdef CONFIG_F2FS_FS_LZ4HC
+					ret = f2fs_set_lz4hc_level(sbi, name);
+					if (ret) {
+						kfree(name);
+						return -EINVAL;
+					}
+#else
+					f2fs_info(sbi, "kernel doesn't support lz4hc compression");
+					break;
+#endif
 				}
 				F2FS_OPTION(sbi).compress_algorithm =
 								COMPRESS_LZ4;
-- 
2.25.1