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] f2fs: introduce f2fs_is_readonly() for readability
Date:   Thu, 24 Nov 2022 01:01:53 +0800
Message-Id: <20221123170153.15888-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?EtzF4B+kBRbZf9wQ8ZzMLEcgWHpBWCx3UDlXRlvvSGuqGRVGrvvKD4iVzKTn?=
 =?us-ascii?Q?TeBmk6rPbLJS0/7/oerew0E1jUSqIIdgURkOHl890N0LJ5jY96eOBgciwdGp?=
 =?us-ascii?Q?3jgmcEkex8i/0UAbKEtfxWcPb0TB/wjZ5N/Ngu0GfeHJewj96aslAEhwRObR?=
 =?us-ascii?Q?7axOFSnikgn939pAdYDDQt/uEV8yl+Zh5SlHTuV4i+jt9iA9zjFrf4GF+Xz+?=
 =?us-ascii?Q?wO0YWalJKidomH/BapdfQ6EvS9mIrBnbDAVV7Iuqc7u/YkTRklakgo8gFfIg?=
 =?us-ascii?Q?POy2uWEzCJ3EjgsmRCGf7RAaTNyJOrjd+prb2T8VKrkYI1LyRW2X7v4heM2Z?=
 =?us-ascii?Q?IM99b2omIiV8hUs4QuE0mHNr2M+xetICGWc+DGQ66Nq1eMjcwmYU3rBHqjPJ?=
 =?us-ascii?Q?cOXKfUoZWQjEU+zTn/cMC9GnCr7ic5A3mZdyKSvoaJgdpSBcrD9AKyLVPnL1?=
 =?us-ascii?Q?Em9LUHjcGcGQdgK6k1ABWZeqnExvLCRoFzdNWUrtStob59PTDRKuxgR6AWPt?=
 =?us-ascii?Q?X35jY4LJoaGk9W4omv0Q3TOcpAnu1TJG2b92anLWQ6Sjecmd9xsUKyuDiJ9D?=
 =?us-ascii?Q?ytXJ5BfpOxIab3AO2ZeTf1FlqMN0pFAvXp2Zgs7wG1hZsol6/gyzLqOEe+xJ?=
 =?us-ascii?Q?tewljRKxnqvzzEvGrV3HJlA85WuRvYJGqmiF4pDJyJX7FO5dr7l/fLdQfNBa?=
 =?us-ascii?Q?x1ln194v3f8aEB115xUBvi0U2cC71oAgaggJslGUQgsVkHsHUA84avIGX2VJ?=
 =?us-ascii?Q?MBzLeOKDuDtCup0S82ERsfR5N0dcKSpXtacSyhFiEo2nm0tzZgj2EZoSFIqS?=
 =?us-ascii?Q?ujOilsM5jqlW0OwcrBLWg0+zhugnKV4BcVSIpU/i3fHvZ/O251oIqr3DQuCT?=
 =?us-ascii?Q?VEvafaJg3RA59N/JmCAcww4usAQHfPFbpSIS6HU48MMY3ljRWK6gfTRXXQML?=
 =?us-ascii?Q?mgKjjZL0eEHW1b6ftOTD/U2yBGB+YlzK/yG7J8ObqtOwNIxyIMeAW5zgHrWW?=
 =?us-ascii?Q?Jcz/FbXChuyeDiMRAFZypbOTr0MqOQ3AZ7mE3iKsqFpbpQ0rzuJOfCN6Dww2?=
 =?us-ascii?Q?BDqmGaNJWiMVJp3PS4RBZcX3o7b7BZP/wDaqwUjeQThad+mfX1IBE3Y2mwDW?=
 =?us-ascii?Q?np6tsxy2vIVPR+nQd2kVInW/579Pavb86j9wFzUKrSvxWU8nQxz4jo3wQd16?=
 =?us-ascii?Q?giDizf7ar/1mecV1v59chCgnmDSqEnFwMmcDYmigcWBnkI7bIAQrgxZxeWtU?=
 =?us-ascii?Q?ES7XzX/QMeh3MboJwu1AfQHbNBHQZSjXG3R/DkhZsgQPGkIXiOgdgojmjxgL?=
 =?us-ascii?Q?+XwAVwAVL3jjURfG/Dg7ysCLyGGk5AiLWdjZ9Y4FCUR33o72NWI6cKLyMM7Y?=
 =?us-ascii?Q?NkCQS1YGYmQswBkICKpKhKu/nbpqeybxEigGyhzK5C3nEctLTCvLwMF2xaUR?=
 =?us-ascii?Q?thAZqrybDN5lilxGqAuZS0SM9BwswalWOZjUrOtHg3PjY10g9YQJYKJkGpTH?=
 =?us-ascii?Q?uwSqjHK4S4eSsR3hPXNpurz2TtDVBqJprQ7r3YnL3UqHFellVssUwnSzlA0T?=
 =?us-ascii?Q?rnKyYNnnJUxOoS5XhOp5MP4n9qE/oRZJhMKYdIc/?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a7bed81f-5264-4e27-df99-08dacd747394
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2022 17:02:06.7270
 (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: jh8gKV1VRG3JxVfqLvTnphSrfZOMKuzfaASOZx2SM2P0PRlluso+vI6XYwEzrf9K4OYfnsUTvDUoIjkaM6iy4w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR06MB5368
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..efc9d6d7b506 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