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: return true if all cmd were issued or no cmd need to be issued for f2fs_issue_discard_timeout()
Date:   Fri, 13 Jan 2023 03:14:04 +0800
Message-Id: <20230112191404.59020-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?SbPrbFZmN5c+soJLWk3JlIIBMnmTy7gGYW3reFUwmAA+6jWJ0i025i0dbLpO?=
 =?us-ascii?Q?Hp/6WiSV7ZQ81IMAY+1lTaHOhf0uaxjz5tVvh6gZ3aKDRZfvUTMqf4+meyzh?=
 =?us-ascii?Q?irauRllj/fj1wb8r98dDJW7oBOBV75TcXOgnDQGzJ2QDM1nZXOhRrEfVs/eF?=
 =?us-ascii?Q?85BFsQj8XZ47r65GP8X2/w/ZTfRxOk8f8/nwzfFB7OWlZfCSd69a0RSa06zV?=
 =?us-ascii?Q?wdUadZoxMnnqTn68tTfANxSEJlZOrmvTBvJRfoGqr5rfQ9NfRtIlUYJTxt7F?=
 =?us-ascii?Q?R8yW+Nkw0RjTRQuSYPg1paeOg6/WEzO3843uXBhwPo0pgRZ4tyf++/EfjsuH?=
 =?us-ascii?Q?n0L3sW9w7adXlT6DrP2fX8g5UubL2d4BsS2U/Zy8U2uBpM27/rVkNysdXNGQ?=
 =?us-ascii?Q?uvtQWBOa15n7e700g521fYOMTvrxh/EQZG7xT4IxPhTz3sJlOGGf2GxyUD+H?=
 =?us-ascii?Q?TbujKAmPDUrS1tD1G6c2IOsfBqiHaAXKB9i8eWWSxvAkecdKThllYy4ESHs0?=
 =?us-ascii?Q?AicYj66fCR86VdGZu1n7z1Oot3r6p7LT1jjHoZIulPxkX/aHOwbGRHokJC+I?=
 =?us-ascii?Q?HUagCaIZnTNh+rhp3l4v6QVejrXegFqL23wxmNjb1z/PMf7XlRr/hBRsWhA3?=
 =?us-ascii?Q?jAGQMkeH5G4imovdXg1MDQG7/xsrVSo0z/ILp8RlfG+/iNa9RpR7tgRa26sM?=
 =?us-ascii?Q?2k9kvg35A/T09EW/4wkFi2E8ciLWJIAZLDit0hcP+ZVEAX8qLtQVUzOedXgI?=
 =?us-ascii?Q?GxQRFFkJtUM6ySQqq4V3l/73xJO/7AtwqICexBriz9Nislccrv2OnK9h80aX?=
 =?us-ascii?Q?LABgnDfcPCql5j7EFl6aiIjOcfWiBd3ABUB58YEeGn6Uy7mheXEk4Ia32nKn?=
 =?us-ascii?Q?p+KytTWG+yGiO5peA9S6u/mOj7ccMwUE6cie3RTZXfSmU+/ffJxq5BjoHlIz?=
 =?us-ascii?Q?p92rWm821/Kl5tM+uyDxNBVrguL3lcmHmw84BF3DCP2aFisEiKOWRsgnpVpw?=
 =?us-ascii?Q?AhOWY3/kQu5TGLl5xLtCQXpS7Q2tVQjQCzuHUwfjwXVnvSYNwmwmVMGGdnae?=
 =?us-ascii?Q?yMbFKzSfaX/j0YjQvpnDOCMbXuw4HAhzFytZidXHKjlBaPiwPBzmVkYO3sda?=
 =?us-ascii?Q?ald7NNprXO1Oo8CWES8T1gfSLnjf/WYv/bquHyLCyNX403+HP9hlDEimPMDS?=
 =?us-ascii?Q?bLhYFvscWhszqg25kGYs4z5Y4HyGYh7yR/1EXvsR4rxRJgJM8ZWwtat5eter?=
 =?us-ascii?Q?0T+caQ5e7d9242pmqFUF3D6y+hH8t64RZ6c2iiFgUBY5YIB78V3gygStur6A?=
 =?us-ascii?Q?hK5KaIDSvGgeaNXRsyB+o6glUDTXLo6y3POSpIVvaWP153xNrkmA39WIN1Nj?=
 =?us-ascii?Q?EHYtiOJ67FvHklB5996BFoieX2+t5z5ZHPYN3iDIY32HQFfV7w3EsXauIEQD?=
 =?us-ascii?Q?Ggqm2SeYQmS35hbwFBBKMTOAnnN4eanzFeZjvhyBGx+jheoch4VwqlS0rzP1?=
 =?us-ascii?Q?uGQDk5DbPkeBSeXBTN7WOFUofs19xGZkU1vpFcvmbleMsN1I5D3NZu4VFtUd?=
 =?us-ascii?Q?RGVU+HTDrlFGplAKM4YIzVGX3uEZGIwwF9k0nCQm?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f12d6343-34da-44d4-0cac-08daf4d13158
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2023 19:14:14.1730
 (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: qqqh7vDs723Wc5VcLuRB2VT6BFgGcgoKYDAtVY44EypBlDDIWyZZpl15CuYpSVtZUNbVE9cldKwi6NlxgS4h5A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4202
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

f2fs_issue_discard_timeout() returns whether discard cmds are dropped,
which does not match the meaning of the function. Let's change it to
return whether all discard cmd are issued.

After commit 4d67490498ac ("f2fs: Don't create discard thread when
device doesn't support realtime discard"), f2fs_issue_discard_timeout()
is alse called by f2fs_remount(). Since the comments of
f2fs_issue_discard_timeout() doesn't make much sense, let's update it.

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

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index bd1cd98fa6eb..9346209b7c94 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1650,7 +1650,14 @@ void f2fs_stop_discard_thread(struct f2fs_sb_info *sbi)
 	}
 }
 
-/* This comes from f2fs_put_super */
+/**
+ * f2fs_issue_discard_timeout() - Issue all discard cmd within UMOUNT_DISCARD_TIMEOUT
+ * @sbi: the f2fs_sb_info data for discard cmd to issue
+ *
+ * When UMOUNT_DISCARD_TIMEOUT is exceeded, all remaining discard commands will be dropped
+ *
+ * Return true if issued all discard cmd or no discard cmd need issue, otherwise return false.
+ */
 bool f2fs_issue_discard_timeout(struct f2fs_sb_info *sbi)
 {
 	struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
@@ -1658,7 +1665,7 @@ bool f2fs_issue_discard_timeout(struct f2fs_sb_info *sbi)
 	bool dropped;
 
 	if (!atomic_read(&dcc->discard_cmd_cnt))
-		return false;
+		return true;
 
 	__init_discard_policy(sbi, &dpolicy, DPOLICY_UMOUNT,
 					dcc->discard_granularity);
@@ -1669,7 +1676,7 @@ bool f2fs_issue_discard_timeout(struct f2fs_sb_info *sbi)
 	__wait_all_discard_cmd(sbi, NULL);
 
 	f2fs_bug_on(sbi, atomic_read(&dcc->discard_cmd_cnt));
-	return dropped;
+	return !dropped;
 }
 
 static int issue_discard_thread(void *data)
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 5fc83771042d..8f13798058f4 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1546,7 +1546,7 @@ static void f2fs_put_super(struct super_block *sb)
 {
 	struct f2fs_sb_info *sbi = F2FS_SB(sb);
 	int i;
-	bool dropped;
+	bool done;
 
 	/* unregister procfs/sysfs entries in advance to avoid race case */
 	f2fs_unregister_sysfs(sbi);
@@ -1576,9 +1576,8 @@ static void f2fs_put_super(struct super_block *sb)
 	}
 
 	/* be sure to wait for any on-going discard commands */
-	dropped = f2fs_issue_discard_timeout(sbi);
-
-	if (f2fs_realtime_discard_enable(sbi) && !sbi->discard_blks && !dropped) {
+	done = f2fs_issue_discard_timeout(sbi);
+	if (f2fs_realtime_discard_enable(sbi) && !sbi->discard_blks && done) {
 		struct cp_control cpc = {
 			.reason = CP_UMOUNT | CP_TRIMMED,
 		};
-- 
2.25.1