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: remove submit label in __submit_discard_cmd()
Date:   Sat, 12 Nov 2022 00:13:49 +0800
Message-Id: <20221111161349.60689-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?QZBhsqbYI8TvgI3gWcjsSzo9n1ntXwuB8NCI1e5iba4NZNSlhNY01nzU19tG?=
 =?us-ascii?Q?XeypC/mmmdC1LtjeJm6dFrmKvg4eBqMWfIextEfMiBBodZ34pUhDOhmkUGt6?=
 =?us-ascii?Q?cZxv6F6Us7rkSz+4GpTesmz2ZN0fk5BRRtFiyZGEEYIE51bs8AJwrT6UUg4Y?=
 =?us-ascii?Q?3t26R1DlnFH7yAYGl02yRx3MweEJ9mfxPbKtAT8LSoS0NVlw7SECNbPg2/Zx?=
 =?us-ascii?Q?PHkVYoPTtk8ig9Pk5aGKkZacpM6T4b/5Lalc78jO361igygfCULXSKIklhdw?=
 =?us-ascii?Q?3F9KrZaqPP5rl4otlZ38KGZIJ+3GYfXqMkJFon55320JCesOiIhGDSqvCJrT?=
 =?us-ascii?Q?Nx0mpIiVqgZuLVD8cCKJhhkv1f+dURli6h/dctoMjWlADjCr3m1TijXdQ2vq?=
 =?us-ascii?Q?zeiB1mjxd30GBOEoN/865SJnEjTLfmA66CRkuuJFrNy56Cr8ac3jDtAkCxdz?=
 =?us-ascii?Q?LcBLK8hZJJJCq9WqXKwbNVOuhxqD6oxO4lEHmtOdmuCWiuY3ESXtODNN4h5p?=
 =?us-ascii?Q?LBWGND7fLNJf6eQe5iQbq272FlBArKWB+rJt0UmIf0/HB/vUqVpvGBOSK4TX?=
 =?us-ascii?Q?a7uPU6VoAhhztO2hbtxPr5hJ39tra8Yufog+iwtW3W2QdihmsX+CFuz6ZqJq?=
 =?us-ascii?Q?nArmHzC8Bit0csZ2I+DpI7JjVVToQa0VEOiv/neK28Mv6bpqjqLn1mZPZb97?=
 =?us-ascii?Q?ifLYGmeLYlFEt7sCQmCauEzVzgxjz9DEkdNip0IESkNDeRivT9/c1eihbpif?=
 =?us-ascii?Q?+BWDOzLcI/ABHFhDIpkDgvLw5M7HnRhJvx9D7yEHQ1jGdL0FxvAz7BP5aq2x?=
 =?us-ascii?Q?nqWsATNSHlt9GbrsXR7rIfntxleM42RJZXgxEXhGuYOJSkfDBwvYeX1hjmfK?=
 =?us-ascii?Q?DqXRst0DZqw0DdUonUK1GmdQR6Xt15hJ9duFQgU4rwem35yequEPorOdQ2Ob?=
 =?us-ascii?Q?60n1LNQNh1eWVb7RQEKCZ5JFgzQPPCHLEfTOmEjDHO0cB6swxAd2EeEUT1+i?=
 =?us-ascii?Q?B4vDn/2euBliedBZW5IIEo3p4k6KHCrOhvQPZm+wu/Q8AG1r5ft3IWgF2Mp1?=
 =?us-ascii?Q?PMNn3SXAZx5+7vsDDi0aMkwLzNBsLcryWdcJPy5TLXjA6yntf7YS0rchyXot?=
 =?us-ascii?Q?5ilJdGZuQvPEhj2a9YxlUvhY2un3Kjq2OW8d9eXGY0rqNR7yGY8zvHabugsu?=
 =?us-ascii?Q?5ZRCgXgOQN7YFliepnyasyb6274Ra0GGFcZvUR+7QGv+Npah7AvyA0nbBgb5?=
 =?us-ascii?Q?imdrG+r9nY4PkEByhbzG/j2cs44Va1EYhXADf5SESXkFJL1muWMrDtIqGaKN?=
 =?us-ascii?Q?np7qTCyQ7lbCROmnZXrkjqfUN1jhRYMu0jolmrBpL9badGgHIiBWqYcaJnQS?=
 =?us-ascii?Q?bPPjeTS+AYyP0mgNQNjUdQHvtrhhEV3zfwDVZB8zRizqQ7eNddxvUEQrkHWs?=
 =?us-ascii?Q?eXRrvz11RfP9ekFxR72jpbUq8XFTK4BW5gBfoosxKWMud0QqM9pdutsy8nVU?=
 =?us-ascii?Q?LuBZy9F2G8pD5hQLj1FmbuYj2Q/8QwaYZTmbJUopncQFxoMPfA6oqI1O5gh8?=
 =?us-ascii?Q?2Yz1I7t9Qm/wUASPGtNrbFySfyZPK1UBwi8Ze6JV?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 53dfb421-d67c-44bd-eb14-08dac3ffbcf1
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2022 16:13:58.2738
 (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: L/1UsKOjZpBPXoIf2vOVn+tsRV0J7uEeDD0HFGRked1JkwogeD0PfAarESLAzFjHRW8CZUczApnnCPOsX0G5JA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4219
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

Complaint from Matthew Wilcox in another similar place:

	"submit?  You don't submit anything at the 'submit' label.
	it should be called 'skip' or something.  But I think this
	is just badly written and you don't need a goto at all."

Let's remove submit label for readability.

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

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 3654c30e0517..0a72e787c585 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1144,13 +1144,11 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 		if (time_to_inject(sbi, FAULT_DISCARD)) {
 			f2fs_show_injection_info(sbi, FAULT_DISCARD);
 			err = -EIO;
-			goto submit;
-		}
-		err = __blkdev_issue_discard(bdev,
+		} else
+			err = __blkdev_issue_discard(bdev,
 					SECTOR_FROM_BLOCK(start),
 					SECTOR_FROM_BLOCK(len),
 					GFP_NOFS, &bio);
-submit:
 		if (err) {
 			spin_lock_irqsave(&dc->lock, flags);
 			if (dc->state == D_PARTIAL)
-- 
2.25.1