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: fix to set flush_merge opt and show noflush_merge
Date:   Wed, 26 Oct 2022 21:05:04 +0800
Message-Id: <20221026130504.26312-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?9qz+MoOjhOcRsfcFf/lFMcYB+Mplkc6c95hCZ7kRKlIfG01lgUpqvT8lvWCT?=
 =?us-ascii?Q?pI+yM8a7GkmB354HvU4CWQ3fza0GGjQWHSBHbe5PQ6G4GHwNfR8VjyIeA/XX?=
 =?us-ascii?Q?HeUWdkvIFD2MFj4ojvrxsNshHRuRBF5CtCmEcENFWb+Dixu6BGSbTF51dMq0?=
 =?us-ascii?Q?FQDa5PPS007t5ksPP971CWhMhQg1c5c01NN4VsOjFujY3iUfp9OVViqK8qhO?=
 =?us-ascii?Q?euOk8u6D5CwCJhlaS335MKfy6cpLQz8VFf0NhI58FpiFT3QFHQAq9NnNG6iw?=
 =?us-ascii?Q?Ix/zjOswqse/57ukjJkQbKPGZoGQb9Xtmsu4v3THmyuxuCp+25xQI4R2z5L2?=
 =?us-ascii?Q?wCar3A8Rbwc9ZhlH8SJfn2PTzz3HGiMNQVyyItPWwI12j1Y6yBJs6cX8LV4R?=
 =?us-ascii?Q?BlpTObq3yeD5tyG5mAhHTpu2XBXLSJsp8SIE0ZVlZFDKIDwNl7Z4JVR04nxr?=
 =?us-ascii?Q?fI5d4Wz5RzPNokdlFid+a0q1elnEyw+vVhW1doJJiWigmWUvGFv3YyXMn49I?=
 =?us-ascii?Q?ooQ6VAWi56g1HH33z9T66NyeT4IFCaCsdv/3wKXDmB85WQFQW+F3ae9f+Vy7?=
 =?us-ascii?Q?COTn6SdS8ufh+fZeo7M5cX8pG1P08+y2hezfgGBuS1QHh0AGvDJM08ZXD7zb?=
 =?us-ascii?Q?PaJXM3caM01n/o5lPE9PT2NqDGO68oaib9vKTNecCsepZrJI0jz8LS3504M3?=
 =?us-ascii?Q?GqwAKy5+qlSNzgtS38mBKLR9d+iscWM8ANe1ztHSAc2oFi0dAn1tOuMaALlf?=
 =?us-ascii?Q?5aD8JlPdRjV9S8V42Js/rTuhlcAJfO2gU03wRddg934fu5sfnobBbp4gP4u+?=
 =?us-ascii?Q?B0ohLOxD9QpcPtXtyaCJwtdSFbb3lgpvP8u0+o6PHVH2ekGPPzvy6/no33Pu?=
 =?us-ascii?Q?JlyY23CPFfvqPA0Nx8SKCAwGOR6zOVf/7YmWwW90Fu8Ic2j6kREZcI5kJvLR?=
 =?us-ascii?Q?Zm26AWTtzAgTPo9/F2uJnOQvuJUaVOZA3E2oSYiTcHwPy65cyvPMnPn/l66Z?=
 =?us-ascii?Q?COcGrzGE8scbizMEg3B1qEYzw3HQLTfY7QetC3sND2fNRH1m7chyuL0DoWku?=
 =?us-ascii?Q?4gzxBPGKJpMXAAuRK5bt7NeNjy+SRzwKVnYs62pFlgkfY6mBFppumUFoNd90?=
 =?us-ascii?Q?KKAQt/NaWlbDDNkRMoRH2afHoTAjzN2Y0S60bAtro1+Unemk6rrzBhEng/XG?=
 =?us-ascii?Q?Sv+F5IXYSdiTA6S6v7DHU06IAvFIsyMR9knym5Um9ydUMOL9IUvLo4WU42jg?=
 =?us-ascii?Q?lFsICooiwhwQDRuoNa12uB0ub3e8HloQIS01+NvMXhsrLm64SOI6VdjsqvDn?=
 =?us-ascii?Q?SAKkZAP0P8YZnDilR1is8jW9fKlaF+vfEiLxxsdVtiDCHPbjTlY9HmiqMU4M?=
 =?us-ascii?Q?gN2Rx0izA8J120UZjMT/8Y3t3V4PP65Y8y3L91YCH6xH6bTp3eeK4cPDW3je?=
 =?us-ascii?Q?Bw2Izd5k5bbsPD3b3qOcZ2y+TgsbeJN+3cev8S2vn6g+JovXimJbzmFSSrZc?=
 =?us-ascii?Q?cTCg0dTbOU6IC0GOsT5tY8xzNMW7Zt6oQ6MlbCTI+3OhNHqpdgbOvF+Qq2l4?=
 =?us-ascii?Q?9439epXozYSv1yL2dJzo99PuzUSKFH3u3NsgPFUo?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9fc83f7d-ce77-4818-f0f8-08dab752b869
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2022 13:05:13.7529
 (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: BroLWJ5lh+YZZPH8uOLMEi3qoPJurYIlsRH6Ezkro+ABcTEy6G1oMTCkR5aBfN3V4NKF1ky/KYLmPucR7htXGg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4035
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,URIBL_BLOCKED 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

Some minor modifications to flush_merge and related parameters:

  1.The FLUSH_MERGE opt is set by default only in non-ro mode.
  2.When ro and merge are set at the same time, an error is reported.
  3.Display noflush_merge mount opt.

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

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 3834ead04620..475fa10c6007 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1347,6 +1347,12 @@ 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)) {
+		f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode");
+		return -EINVAL;
+	}
+
 	if (f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)) {
 		f2fs_err(sbi, "Allow to mount readonly mode only");
 		return -EROFS;
@@ -1935,8 +1941,10 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)
 		seq_puts(seq, ",inline_dentry");
 	else
 		seq_puts(seq, ",noinline_dentry");
-	if (!f2fs_readonly(sbi->sb) && test_opt(sbi, FLUSH_MERGE))
+	if (test_opt(sbi, FLUSH_MERGE))
 		seq_puts(seq, ",flush_merge");
+	else
+		seq_puts(seq, ",noflush_merge");
 	if (test_opt(sbi, NOBARRIER))
 		seq_puts(seq, ",nobarrier");
 	if (test_opt(sbi, FASTBOOT))
@@ -2065,7 +2073,8 @@ 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;
-	set_opt(sbi, FLUSH_MERGE);
+	if (!(f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb)))
+		set_opt(sbi, FLUSH_MERGE);
 	if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi))
 		set_opt(sbi, DISCARD);
 	if (f2fs_sb_has_blkzoned(sbi)) {
-- 
2.25.1