From:   Yangtao Li <frank.li@vivo.com>
To:     Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <chao@kernel.org>
Cc:     Yangtao Li <frank.li@vivo.com>,
        linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org
Subject: [PATCH v2] f2fs: add compression feature check for all compress mount opt
Date:   Sun, 19 Mar 2023 15:51:30 +0800
Message-Id: <20230319075130.24962-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?ZbjM4SqKlKfA2PXX9Cd/4DxchugUhbsuRLWn2h9c7i32OlfsCiVR+gx80BZD?=
 =?us-ascii?Q?MPYpvPAmt3d5VGpsguXhxFhAIxFXrYccdB+0miH18E/o9+AKWUPhTX09dWuH?=
 =?us-ascii?Q?86/nt5m6yeDFSIPnCjrKm1qac+I6XAqntYD+Iishu9i7Nat9yWfkrE5v1lg3?=
 =?us-ascii?Q?wNrWRvJ+3Szxy2cGjRWv2E5i1o7x5IpGOWNDQzQU6e609sYXeRqp5qNSSdrp?=
 =?us-ascii?Q?KH3ADGgbX0VL+k9OxVeh5fwJxumgcnrjf5QqHVcq7zLFoOYAtWsxw3J5giyV?=
 =?us-ascii?Q?AMe1gN6zNqTmSPTa4Xb7TXt6THvhn1MeLRSkmi47zfse1o4Tj+XnKvlnrJzm?=
 =?us-ascii?Q?zNxIi+OCwkdzpRE5qb1LkM1DsOY7G17OAOOK91oeqS9lNvf4KZUScm/ZMFJS?=
 =?us-ascii?Q?NTFs+LLpKhZ5/AedgRJTZ4NgRApCLc90TJa+ozQLAm27NMdqAaAddHwIZUWy?=
 =?us-ascii?Q?SRqOJtZvHO6YWfCDfIV8UGX7CjusxjA+If4GSpSDyXkkPcCeA14dW2LB/4UG?=
 =?us-ascii?Q?BiBC/O6QXR82dj75kRos0uk1/VkWa6kCzUK2iVbmeQ/n04l9Gqia/aFYBjlt?=
 =?us-ascii?Q?zO9htz+Md7D+OMtYuCVnguBN85L4oDn/z7ddlzi1Tl9ZzF8suLt0aP4dYRGo?=
 =?us-ascii?Q?X9ccuuJuvwm1DcdMxl7NqUhyYiplj5Xujip9Zrxm7cXqCeEKiKTMtye2XWpO?=
 =?us-ascii?Q?7xNHPWVdQCdH5kmMqzUCoIgfyv/OHCT71Z2ZDwT8oQ7JNzvkl3dgihgEovIu?=
 =?us-ascii?Q?u7WbhaEv3ayQR1uDZSuFztOtlXgnoby/e84+KH+R6kOXIP6DqZKQ8EOqwzS3?=
 =?us-ascii?Q?Naq4mfgJw4IA/lsLN3HPOnmp9cBgCItp7Rd2mWB3+KKyF12Bd9Wx3EyySE3o?=
 =?us-ascii?Q?n9BMDtWi5ra258ZI9FlGruzPB2Jo4+0RbtSNZ9i5ENFvSMrlMwCPIxmMmHX/?=
 =?us-ascii?Q?oWOpDh5AoZ7TkhnxXHYencrFH3+oPNqyT0uwj1B2rIw5vmmUwrp4QfU+mamv?=
 =?us-ascii?Q?pOosKE0WbwM2LRsa0f16IIjPN2lZYSlZNlS0xADMd7RLwXidq8Tw3LO+KA2C?=
 =?us-ascii?Q?b2NIuqeeaf8dCekpb1VVwavKx4Bzo3bsqh5b4hLvDqKkpSuATT5RHigQA5j9?=
 =?us-ascii?Q?iCbVLQT9T43NSR14zj2iQdrQsNQhJaTbmwk1X434cjHUKrMMYEGZi11lWlo+?=
 =?us-ascii?Q?1cYX1l6Mjp0hRNwTAI8o5tcSNLFvVPHgCU+aIdbBM/8nXmpyiwV9v0CtzNAG?=
 =?us-ascii?Q?AFqFC5xP5CAGi8qyLjzB7rPB+2uP4c0mCkIsGHR+w5JL7axFIQhJBTZ5KIR3?=
 =?us-ascii?Q?2j54RhGE90ITBTTaoCvmkWOj8M3oN4hIFWGOyv1oe3J3He/8RStLrb4EX/ie?=
 =?us-ascii?Q?BI+aK43+h8oibRPBhqwztITHsgHqgoyrnwgVm4a3oQOo2N5qpFR9DXBLqeoW?=
 =?us-ascii?Q?5ms+/d9+jn4yEbQ48iZ6y28wlW5i39i99k0EG3nnGD1YXsuV/njGeUrwI72A?=
 =?us-ascii?Q?J8JYCpBAZ0RUfbFwFZU6Vohi6VV2y7eFaOX5Lnex518AeTYSodf+lMd2pNJp?=
 =?us-ascii?Q?V3YpqZhx53FnkxhanuWQqGBp3fl8sfmIzYqFy6AI?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a36a097b-f488-46c7-f941-08db284ec8e7
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2023 07:51:44.8762
 (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: FSRP7/uUvfg1JwTS0F8rZ8p+lPhZBZAkMFfc0ruvFX28gsjpGxyPN/qFF4TZbBy7helu6ABKXFdb9PCx9Evxtw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR06MB5626
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Opt_compress_chksum, Opt_compress_mode and Opt_compress_cache
lack the necessary check to see if the image supports compression,
let's add it.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
v2:
-drop f2fs_mount_opt_need_skip()
 fs/f2fs/super.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 9c87d91df61b..a88706bbfc0d 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1179,9 +1179,17 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 			kfree(name);
 			break;
 		case Opt_compress_chksum:
+			if (!f2fs_sb_has_compression(sbi)) {
+				f2fs_info(sbi, "Image doesn't support compression");
+				break;
+			}
 			F2FS_OPTION(sbi).compress_chksum = true;
 			break;
 		case Opt_compress_mode:
+			if (!f2fs_sb_has_compression(sbi)) {
+				f2fs_info(sbi, "Image doesn't support compression");
+				break;
+			}
 			name = match_strdup(&args[0]);
 			if (!name)
 				return -ENOMEM;
@@ -1196,6 +1204,10 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 			kfree(name);
 			break;
 		case Opt_compress_cache:
+			if (!f2fs_sb_has_compression(sbi)) {
+				f2fs_info(sbi, "Image doesn't support compression");
+				break;
+			}
 			set_opt(sbi, COMPRESS_CACHE);
 			break;
 #else
-- 
2.35.1