Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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 v2] f2fs: introduce f2fs_is_readonly() for readability
Date:   Thu, 24 Nov 2022 10:48:42 +0800
Message-Id: <20221124024842.4809-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?Wi2gUIngN4PCjpnQCQO3o+4aeZiEEAxcdJUZJFk4iPCWZLlUavSsXgp09eMG?=
 =?us-ascii?Q?kQswRwOIqHTFw1u4RkGVECHlvhS7/mulbNc/40H5wXp8Ny6NNri0fsYiwXos?=
 =?us-ascii?Q?3D2NX0T+uajwLvPkbtlX7QKiMC5jizRFyk3/6ZYlUb8KqBYeE/0cIt9byR7T?=
 =?us-ascii?Q?nrr+3r6qssY8+deH1oeIUTKTEsEmYitSJvaBEyAD0jhbcR1h+tYPJudoUmQM?=
 =?us-ascii?Q?NJY1zJMb9t/xXbEl0pfEt1pgD59lSKNe8rIYqQUX3+ndRX7q0YJAwqaveBaA?=
 =?us-ascii?Q?tcBNXl3NdM6hQdJkVgPhHIeFpkt4FyCIiaYyIzm6NDVEgsOVsZK/WP0+NMs0?=
 =?us-ascii?Q?52GhKcc7fKCTmlop5OykoiiDxiecjguMutNs9TiMdI6sRIOwf7+42REf28v0?=
 =?us-ascii?Q?aizE0jcxkl1ty1+aVBCBcYr/enHa+r2XljF9hxGDxi9SBxCChDXA8PIHPbTD?=
 =?us-ascii?Q?fxMxydvNlvJSruPMM0OHLroIP2bQ3FTAegOrLC4o+a9yi4U6C0BXJWB9ykr8?=
 =?us-ascii?Q?hZPOKKIQJdS8XvhjPmDBUK9hBJcafhJc6X61olhpoWoxVn/OH6OsCd5SMehy?=
 =?us-ascii?Q?TuKzTIfJ5OH7TG99QPm8w9RsLtzmqaniTjGt3x9BvfhJb8D3Oszam0D2A8aN?=
 =?us-ascii?Q?WA/TKj1Hejs7Q2izzT6Uh008IE6zoA38QHlMxxVUIk6o5vS8av335C9mC148?=
 =?us-ascii?Q?2uGbBtvT+O/FEVsGLkQ0I6ucAkcdZjnuQKikiin/p4bayikcEH0sxNJ7P4Ee?=
 =?us-ascii?Q?ilcseNxnEdkYNXbapXuKh5LPSEjZ9eBPL0lzj3ijuVw4J9Vx0Fb2HGNUNbfN?=
 =?us-ascii?Q?9JByStzAy3jVJAnO46Ae63cK3E0OCGzsD0B1IewndgqwC5r3zqi67HOlsah2?=
 =?us-ascii?Q?dP/MNNDNi6Cv/4JFvNJiH5uRvbRAGK0+8+VTteafhKIMGpPbxNxD6J3UymWR?=
 =?us-ascii?Q?XGC1wPMRStL43j+Uhqr8wvsbjc553VpE918DRLVJ9rh9kqaIkufPFxuBguxQ?=
 =?us-ascii?Q?8B7bP2WeT5o1XQAG9JPgvld5FA5J6BBmhBOKLYyIJEK6w5QX2criZYWHvW5J?=
 =?us-ascii?Q?k45GerOLasbIpZTYD9PFSXixw3J8kqNaCYmJ4iCuf+tdYuuG2gJ6xWDIekAa?=
 =?us-ascii?Q?c6CDFqPHnQpd2a6gNbDbJYJ1H250WVzXyceYQfG1PjsvKvgWJ3bIFKMNXK0R?=
 =?us-ascii?Q?83OXAmhednQMdp3v5wzFBj0oJPWeO5GnoR4deG4bBfe4Fvd77vzpxcOo1InS?=
 =?us-ascii?Q?X7QJG/gN7j/6pNlpun0ukDJi5lF6hi+p3QoDLQhbNI1qSc/n28MM1DZ+NYB0?=
 =?us-ascii?Q?kZNcRV1pWeLSLsoARZ+3lWSnizurEVM0AeG3B+eeB6oDP7MWk7bhQCvMk/x7?=
 =?us-ascii?Q?OAaYiF40FvxKe4SmxhbKg71ocNTDovlUe6jYWzSusox2Eikmex5PmkEfFuuR?=
 =?us-ascii?Q?xaFoAlZAHecHLFQnDImvJcsOtfda95bUJfno/4KSVvad2eiUmu+P0s1Ztfc6?=
 =?us-ascii?Q?GjV8/r1S/6cmKTUu1yuZITlogHJ92UaC8CvtNCjUJOCXHC7FseG1bBvxeGaV?=
 =?us-ascii?Q?LvSjNSBdZOFAhm5qkxcDh1iOcExCPHxjwhNDlNlC?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 53847685-3d95-42fe-1b8d-08dacdc66bdc
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2022 02:48:52.4714
 (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: 8GhYTd8V2a7UQ3hZPxJFBRn59+B2UaahrzaVmRMue88gxfQ/nRu7m7NGePDm459NMsm+rLRpoGf2U5J5UgzC+A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR06MB5504
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Introduce f2fs_is_readonly() and use it to simplify code.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/f2fs.h  | 5 +++++
 fs/f2fs/super.c | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index f0833638f59e..eaef7ccee5ae 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -4576,6 +4576,11 @@ static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi, pgoff_t ofs,
 	}
 }
 
+static inline bool f2fs_is_readonly(struct f2fs_sb_info *sbi)
+{
+	return f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb);
+}
+
 #define EFSBADCRC	EBADMSG		/* Bad CRC detected */
 #define EFSCORRUPTED	EUCLEAN		/* Filesystem is corrupted */
 
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 31435c8645c8..39c6be61450e 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1353,8 +1353,7 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 		return -EINVAL;
 	}
 
-	if ((f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb)) &&
-		test_opt(sbi, FLUSH_MERGE)) {
+	if (f2fs_is_readonly(sbi) && test_opt(sbi, FLUSH_MERGE)) {
 		f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode");
 		return -EINVAL;
 	}
@@ -2085,7 +2084,7 @@ static void default_options(struct f2fs_sb_info *sbi)
 	set_opt(sbi, MERGE_CHECKPOINT);
 	F2FS_OPTION(sbi).unusable_cap = 0;
 	sbi->sb->s_flags |= SB_LAZYTIME;
-	if (!f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb))
+	if (!f2fs_is_readonly(sbi))
 		set_opt(sbi, FLUSH_MERGE);
 	if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi))
 		set_opt(sbi, DISCARD);
-- 
2.25.1