Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp7761777rwl; Tue, 10 Jan 2023 05:12:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXuo6fDZjQcs1tS2FrJn2Llhl7J+qvtTS9uSCx06NWDGsCV4/16pygP2kZLCricnkFSqebH6 X-Received: by 2002:aa7:ce07:0:b0:48f:fcc9:665e with SMTP id d7-20020aa7ce07000000b0048ffcc9665emr20034906edv.0.1673356368454; Tue, 10 Jan 2023 05:12:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673356368; cv=none; d=google.com; s=arc-20160816; b=LVmszRPKQEQlCt6Fkgvxgj65aIeBpj0HRRm7+q5B9Y8wbllInfjzG+/dwoooLySupr Sn/Jjxow8m4dPCc8Tc/TnvOThRerI2VDGqk53enmS+APUaFK7+7qU0BG2gML6/5IXFTI +UP2/0SJUwPNk7lo1MbS5Z5wQliX7JEpnfJfBelR1uLmGtcRgxx68oXkwAdjslDS5y4H h5V9xRsmtuC+VsIkn/6UmOH6Em4uwvaWEOpSOd97AJA/eJ3ifZjnYdh2O6bvGmXAHshs drIaVGxAM14FCzlxgWdx/kTPDAsqEWjPnrss97ibt+0dlzO+/x2HaX7wrPwUG4RFjYOl EEWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=bBn4PzXhSog1/0BoUdsUny9eMhds7zVe3T6hORxI6t0=; b=jndzlkJEEV5TsVIVO5R90+XJYq/RqANjh2T6b1z1jMK4lsb/glnsRdB/aCeGt/8TPW 9eTHivnDtC5ehykVYeNrCcDYdXWKpGb50jFizbiHK1TM1ZXnjKaHdIpxUWVGW+smNQu9 1vbkyybQZzFQXfPGs/r56Ej4stCyCUCRFM72nAfhWTPJlsSGvQT5YnHbYSmjbj2+EwPd bjvypzq2zGvI29mGRBB+lve3cuWxdJMyQMp3au+1JeqTqxtLqIbDF9yDXNzFBjCrEb+1 hlgaXZ+JRD8N4/+o8rrez2rMmJKfKL7GIsvZ4NT0/VvGAU9cIVeFgLC5wh/D6nxXos/2 pPkA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g10-20020a1709067c4a00b008225eae8881si9002500ejp.312.2023.01.10.05.12.23; Tue, 10 Jan 2023 05:12:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233295AbjAJNJz (ORCPT + 99 others); Tue, 10 Jan 2023 08:09:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238625AbjAJNJs (ORCPT ); Tue, 10 Jan 2023 08:09:48 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 606A961473 for ; Tue, 10 Jan 2023 05:09:46 -0800 (PST) Received: from dggpeml500016.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Nrrdq2Ms9zJqBd; Tue, 10 Jan 2023 21:05:35 +0800 (CST) Received: from huawei.com (10.175.127.227) by dggpeml500016.china.huawei.com (7.185.36.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 10 Jan 2023 21:09:41 +0800 From: zhanchengbin To: , CC: , , , , zhanchengbin , Jan Kara Subject: [PATCH 1/2] ext4: fix inode tree inconsistency caused by ENOMEM in ext4_split_extent_at Date: Tue, 10 Jan 2023 21:34:06 +0800 Message-ID: <20230110133407.994711-2-zhanchengbin1@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230110133407.994711-1-zhanchengbin1@huawei.com> References: <20230110133407.994711-1-zhanchengbin1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpeml500016.china.huawei.com (7.185.36.70) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,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: X-Mailing-List: linux-ext4@vger.kernel.org If ENOMEM fails when the extent is splitting, we need to restore the length of the split extent. In the call stack of the ext4_split_extent_at function, only in ext4_ext_create_new_leaf will it alloc memory and change the shape of the extent tree,even if an ENOMEM is returned at this time, the extent tree is still self-consistent, Just restore the split extent lens in the function ext4_split_extent_at. ext4_split_extent_at ext4_ext_insert_extent ext4_ext_create_new_leaf 1)ext4_ext_split ext4_find_extent 2)ext4_ext_grow_indepth ext4_find_extent Signed-off-by: zhanchengbin Reviewed-by: Jan Kara --- fs/ext4/extents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 9de1c9d1a13d..3559ea6b0781 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3251,7 +3251,7 @@ static int ext4_split_extent_at(handle_t *handle, ext4_ext_mark_unwritten(ex2); err = ext4_ext_insert_extent(handle, inode, ppath, &newex, flags); - if (err != -ENOSPC && err != -EDQUOT) + if (err != -ENOSPC && err != -EDQUOT && err != -ENOMEM) goto out; if (EXT4_EXT_MAY_ZEROOUT & split_flag) { -- 2.31.1