Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp11282119rwl; Mon, 2 Jan 2023 18:13:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXu7d1WhfzIOQElKqCh1eeFrpvGregP05metjKuHKAlWxDSl2nFOabMywUUTjOnKxPbIuORm X-Received: by 2002:a05:6402:1486:b0:482:ab74:6432 with SMTP id e6-20020a056402148600b00482ab746432mr29387479edv.20.1672711987358; Mon, 02 Jan 2023 18:13:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672711987; cv=none; d=google.com; s=arc-20160816; b=osCV96kCuP3zK0eXBz0efXHGC18oo3BJr2Y282m8kK1tA7215AwZaGSjuBeYQCKonE ZECABhwaHfeWh/K0KR0fKsTUd3oAnYEf+RkNS8KAu/8uef8a8Ys6q6FgRxEA9USHNrXM LvYKpLXvWWBLlhX9l3JohU6rMSkSddM6RdP2Mc9hnkDGFbT5uffnvhwS3Qboj+OVWOqd Dszd36H+nUHUdpsuxEN976L6UI3iAfYk6k9w8z41KAbz9/TDu1R/4qpZklwsGy7AlyMw 8GQqL+9Lcsh3KPRPTNV5RfXgCasQgm9qutitgPEpG2GEQMhfsAnL7QaCPqDfQYCfntFw BF+Q== 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 :message-id:date:subject:cc:to:from; bh=c6AsmVS7akm6g4KTAJDMAtrHrZiZBu/x3BlMO97NYA0=; b=gVWqVaDRGVCVC+NY72x1y13jb63a2YZVjYpNApmW946m7q/9X6ENneh/y26EYHK4kv T+FMSPZw9Rq/VOxnSIcKrMjd5dg8hFoEsEZNJmQ8+AED+JO0rWc0NQkS9CJ/K3hLhq0g qJtQE/8PtmBq0RU2E1L0KwS0XUtS/d9yhvVZoe//AuL6Y/cgnD8yWB7lQFstmezm0M8u s5MCX41hOZUzlb4eDgj9mCgdzF2TQSXBtJsJcMF/4j5XmrcEPKkvm1KqrJkFPNDLQt5I EZl83OQV7uTQY7ayhtNTnfqhC9FRS3fsGYC+xx4jof9kpeywebAGDDYhJ3KTMvNIYZsW +tPw== 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 gn12-20020a1709070d0c00b007ae26c753edsi28847662ejc.52.2023.01.02.18.12.37; Mon, 02 Jan 2023 18:13:07 -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 S230182AbjACCDp (ORCPT + 99 others); Mon, 2 Jan 2023 21:03:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236712AbjACCDh (ORCPT ); Mon, 2 Jan 2023 21:03:37 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BA4E8FC1 for ; Mon, 2 Jan 2023 18:03:37 -0800 (PST) Received: from dggpeml500016.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NmGBc6gj9zJpWv; Tue, 3 Jan 2023 09:59:36 +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, 3 Jan 2023 10:03:35 +0800 From: zhanchengbin To: , CC: , , , , , zhanchengbin Subject: [PATCH] ext4: fix inode tree inconsistency caused by ENOMEM Date: Tue, 3 Jan 2023 10:28:12 +0800 Message-ID: <20230103022812.130603-1-zhanchengbin1@huawei.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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 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 --- Another solution is to add the __GFP_NOFAIL flag when allocating memory. 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