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 3/4] f2fs: set default compress option only when sb_has_compression
Date:   Tue, 24 Jan 2023 23:33:45 +0800
Message-Id: <20230124153346.74881-3-frank.li@vivo.com>
In-Reply-To: <20230124153346.74881-1-frank.li@vivo.com>
References: <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?Kvtfq6J8WcGROyBOYeqYq8sbAEcy9yJJeKhtXmd2CJqaPowV4mVaXfPRswBn?=
 =?us-ascii?Q?j8Mm2xdj/io/Ntq5LBxvr7rqsfzUTW5O/DiN8+6kHrUO+k/JHk5jBFZ1Vpq1?=
 =?us-ascii?Q?iuXNMBdgN6N6YuWdbloKI1yCwwJ2W7RUwKCOqBPMqUZ6cF/ispHyu4kWgVEp?=
 =?us-ascii?Q?w57xEtVmXEyhtGimSuANJtKhxE90EJtFGzR5j+riyMZABiPBVjH6aAyVDnuV?=
 =?us-ascii?Q?kYVLjQIxLVEWca+qtDlLW6x7X/HlK8An/fM61F7F/+nMuIOqyttYRbxG1W9Q?=
 =?us-ascii?Q?bVU1AjGGdFJD2fV4gE+XUqSgiBsjWg3aUUGG3YmYcSLKDCFAC6697ByyZP1Q?=
 =?us-ascii?Q?PtahlMDpjiKyxSTqPMAWBEWUo4QSdZ1TVPz62W7Fmyz6Lh5CTfIvlzFvZ/iu?=
 =?us-ascii?Q?zl5cwP+lRH0R9aveqwRNP5nLx+hFKQ067iZN3a8EXJrBY/DZccQGXZ//d29d?=
 =?us-ascii?Q?w7knsm2/BLP8qRVuXvb0jGwEx5wyE4kS2KfMs5IOwwWYBMJLTem0DXvEHE0B?=
 =?us-ascii?Q?efqx2/n2R9B0NeZvQp9wu/KMK4zOxeS6JRHHHre43Gtcn9hMrNIF6fz0FIeH?=
 =?us-ascii?Q?6DRPbzFyvnhB1tQBxClY+uUyoCeKtrSy5vswPaL6FeDQVqPUcEzisWkmPjMz?=
 =?us-ascii?Q?JSH3qkJ3KSAw1flKkHTTlJD6Dvuhgact7CqkpVoXWm1Ixmk7m7GDH5RDbS7e?=
 =?us-ascii?Q?PKpG2LIEz9YA1LXu5uRTjzmvtCXMbJ/zHRZurtedoMQ5PJLMO4nW2rHa1tZt?=
 =?us-ascii?Q?b8i/+o1hYpXG3uop4/OtOR/TKFgJKh+O9+EMFQ9m/WEJT1geuhG8/xqHI67B?=
 =?us-ascii?Q?+K307NRy2FrvNdLLfxgmrl94zEBceIYTDVSNzaesW1hgyjMUv33WeIs3q2Hb?=
 =?us-ascii?Q?VcpOwk2Bt7akoKk6DMxFt+1d7Hcj8s7OFMSLf57ROMv3XihsKCHAod66ER75?=
 =?us-ascii?Q?M/rmkr8Zh87YfV+44IDy64KSb9v80ITm9SJr5PnCRB/HZFUsE/ENIbQ3goCF?=
 =?us-ascii?Q?EKx0JqkalPqejR0lqmAgPaKl+FXlC9+rVm8afF3RITTYgnbBbe3Qdj7lKs4k?=
 =?us-ascii?Q?nA3bGuTa7C4eDg6xSEI9Ch5+BgntX6vihPRdYyvnsoU2jZDyDAtDzyqMSq6B?=
 =?us-ascii?Q?Rn8HlJkkjH3Xtk6CiV37GHWtcp1IvR/POL7ScGb2gO2dlxx1utTCb8XanUaW?=
 =?us-ascii?Q?85wTy50Nt6upaWhN43YoZN2eOGvR3DjD2WwtbYKaHmm4UANu85r9EcTfjpS0?=
 =?us-ascii?Q?kSyti2k1K8MNghftQ09GNO1bzqqe/c/0ksUVo3n6vW5sk3ky4empQJ2wRNZM?=
 =?us-ascii?Q?IQ37h1mhBhe2kn1wbsEWH53MYa3bvUDPZMBfSdvhrAvbdnUdEgWKZ6giP8s5?=
 =?us-ascii?Q?NPqfeaUYDHlopXsR+PmmGkYy5zWYHxjaftIxeKJPaF73q54RDKAvUa4hKDSl?=
 =?us-ascii?Q?1tE5MGB0PaIhu8MZs1cBNotOyKg1+Pzk7rZK/kaDbp8DOATQfl+oLkfyHMXX?=
 =?us-ascii?Q?CsFLQ07upNGPeyexECNGYw2etNc4zUTxp864k678Be/D3Ljo0QROf3uqUW8p?=
 =?us-ascii?Q?+IUc7sBGD1TD3GBFP4lkh9U52GEPo6LOFPN0QM0K?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: df2e40b9-e6a6-46f6-37de-08dafe206ad1
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:34:01.2737
 (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: LHIZjphWEmRJx4iGLswuuG7oX95MAKgZUhkpZkWgz61nRV3DdCcpL3MzuYpthR0y0haO0DZD/sQX1E68Vc8qMw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB5019
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

If the compress feature is not enabled, there is no need to set
compress-related parameters.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/super.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index b5fbe9939390..68ccc9f54c2d 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -2039,10 +2039,12 @@ static void default_options(struct f2fs_sb_info *sbi)
 	F2FS_OPTION(sbi).fsync_mode = FSYNC_MODE_POSIX;
 	F2FS_OPTION(sbi).s_resuid = make_kuid(&init_user_ns, F2FS_DEF_RESUID);
 	F2FS_OPTION(sbi).s_resgid = make_kgid(&init_user_ns, F2FS_DEF_RESGID);
-	F2FS_OPTION(sbi).compress_algorithm = COMPRESS_LZ4;
-	F2FS_OPTION(sbi).compress_log_size = MIN_COMPRESS_LOG_SIZE;
-	F2FS_OPTION(sbi).compress_ext_cnt = 0;
-	F2FS_OPTION(sbi).compress_mode = COMPR_MODE_FS;
+	if (f2fs_sb_has_compression(sbi)) {
+		F2FS_OPTION(sbi).compress_algorithm = COMPRESS_LZ4;
+		F2FS_OPTION(sbi).compress_log_size = MIN_COMPRESS_LOG_SIZE;
+		F2FS_OPTION(sbi).compress_ext_cnt = 0;
+		F2FS_OPTION(sbi).compress_mode = COMPR_MODE_FS;
+	}
 	F2FS_OPTION(sbi).bggc_mode = BGGC_MODE_ON;
 	F2FS_OPTION(sbi).memory_mode = MEMORY_MODE_NORMAL;
 
-- 
2.25.1