From patchwork Sun Sep 18 07:56:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Zmx5aW5ncGVuZyjlva3mtakp?= X-Patchwork-Id: 12979355 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E606C32771 for ; Sun, 18 Sep 2022 08:06:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229509AbiIRIGW (ORCPT ); Sun, 18 Sep 2022 04:06:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbiIRIGU (ORCPT ); Sun, 18 Sep 2022 04:06:20 -0400 X-Greylist: delayed 546 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sun, 18 Sep 2022 01:06:07 PDT Received: from mail11.tencent.com (mail11.tencent.com [14.18.178.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 464FBCC1 for ; Sun, 18 Sep 2022 01:06:06 -0700 (PDT) Received: from EX-SZ018.tencent.com (unknown [10.28.6.39]) by mail11.tencent.com (Postfix) with ESMTP id BBDC7FC079; Sun, 18 Sep 2022 15:56:56 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tencent.com; s=s202002; t=1663487816; bh=m56SytcDR21FyGSlAJy03TLknvHNKTBzoiVRUF9pIlQ=; h=From:To:CC:Subject:Date; b=bIm3j8wjo0T4NwTHONKPLB3rrn4A7tIVKKo6lFqd3Odb3CACaNcNHrwxK1TvQ2JIi gtIj5YF6QR7ixnAZmJ/VDxlubKSTZ+EDvH0aso9gJyM8n2a9yJmtkiTvgj7D+3DU9d wc/0pAotvuKFxuOkjY5de7fBMVM4XfKNHe6AtW4Q= Received: from EX-SZ052.tencent.com (10.28.6.108) by EX-SZ018.tencent.com (10.28.6.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Sun, 18 Sep 2022 15:56:56 +0800 Received: from EX-SZ049.tencent.com (10.28.6.102) by EX-SZ052.tencent.com (10.28.6.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Sun, 18 Sep 2022 15:56:56 +0800 Received: from EX-SZ049.tencent.com ([fe80::e0be:89c3:ec1:bef7]) by EX-SZ049.tencent.com ([fe80::e0be:89c3:ec1:bef7%8]) with mapi id 15.01.2242.008; Sun, 18 Sep 2022 15:56:56 +0800 From: =?utf-8?b?Zmx5aW5ncGVuZyjlva3mtakp?= To: "clm@fb.com" , "josef@toxicpanda.com" , "dsterba@suse.com" CC: "linux-btrfs@vger.kernel.org" Subject: [PATCH] btrfs: adjust error jump position Thread-Topic: [PATCH] btrfs: adjust error jump position Thread-Index: AQHYyzQ41TCWjtAGRkOT/Oz1xUVwDg== Date: Sun, 18 Sep 2022 07:56:56 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [9.19.161.101] Content-ID: <442FF82E05E5B84382A8F9E8113AAC3E@tencent.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Since 'em' has been set to NULL, you can jump directly to out_err. Signed-off-by: Peng Hao --- fs/btrfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.27.0 diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index f0c97d25b4a0..b5c408ed888a 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8146,7 +8146,7 @@ static void btrfs_submit_direct(const struct iomap_iter *iter, if (IS_ERR(em)) { status = errno_to_blk_status(PTR_ERR(em)); em = NULL; - goto out_err_em; + goto out_err; } ret = btrfs_get_io_geometry(fs_info, em, btrfs_op(dio_bio), logical, &geom);