From patchwork Mon Oct 24 11:32:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10382 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp696082wru; Mon, 24 Oct 2022 16:10:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5PxEsg/ryRO5cohYtlOlP6umAN6D33vClqhuiQMav6Zy8pz/fDXS4pi8h3y8Hua2SVZ/5B X-Received: by 2002:a17:902:ecc4:b0:180:3104:2fc0 with SMTP id a4-20020a170902ecc400b0018031042fc0mr35987639plh.56.1666653037055; Mon, 24 Oct 2022 16:10:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666653037; cv=none; d=google.com; s=arc-20160816; b=w+RpVlrpWSEalzEChkeb4gTbdXH0gZ6D9ZK2byBoC4v9zBXFEf8R918Qd2GFswlfvq UZ6BuIUvIp138Wol2qbTJADRKM28WJDBrECKq4u09tUqW6DkSwdDFMJuFsZ1GA8xmdqg w1T7lkJ7+4zp8Ptk8jzUMuIirmVjnyD6N5rN3d66PXnNdmWOl54JyecgYGndm/jJdh95 J9p6pzXohjjTBTKWazTx3fHjJgMEvLgJZNcJHemmxr6nc7nfzNtUxYakFcHE1BNQv999 turfx0UZSK1QsnKDZqEUFWYmbsNdweb8sHoFfa8vrUkNiUO7O+aYdxcmhZwSJJKT8OOf 4scQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=a6P0SGjXbNCva0N66Mya0mr/lNCewNWlMt/yWQwEdbA=; b=rQIaZzgpITiSooVuH7GsOWik78S8UMA8mORXwuXTFyP56f/s/Yod3z+sqVopHN+vqW w9QBZYgtwwab/ML0epo9Lp17a4SKKx3Aq9XpBJQx6Ky/LNI6bFMDNZC2mi2jD4JEhzuQ A4+zntrCtoyqsjbw+wUWulDeNC+d9YZIYMRCA6L5NK82egr4/tl6VvjGQZqS/HgqrnJC c9DWT2CeVocFlIygoYMhzzyqm3Xz4ZkWj5B9WWWjTH8AGqcVwDuQGUoDOa1146GcEG7z RUfLQlpVU+l1shlrRLl2mXc4kNCdAmxgexrVqInUIDugV0A8L51p7QB/nT5ImDCFsMoR /upw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Zj/5OQEu"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ik28-20020a170902ab1c00b00179c921918esi838807plb.17.2022.10.24.16.10.23; Mon, 24 Oct 2022 16:10:37 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Zj/5OQEu"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230220AbiJXWz5 (ORCPT + 99 others); Mon, 24 Oct 2022 18:55:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231998AbiJXWz0 (ORCPT ); Mon, 24 Oct 2022 18:55:26 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9322818B748; Mon, 24 Oct 2022 14:16:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 57E67B811A6; Mon, 24 Oct 2022 12:04:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC0C9C433D6; Mon, 24 Oct 2022 12:04:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613093; bh=jyb3/nDrTgwKr3xF4zM27CdoKJT44I6GKaJXVXMSvN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zj/5OQEuI0ag1Wtr1HKyLiA/O5A/C6w014x0REUgh4mgaT8ujbdi0m708jW7VN6Cp FW+YaZlO2CPCpfCk5qLHV3MjZ2AFBdtqLt8LcJ9AZS79Vrwme56EBC5NxFkT0Wm6WD 3XYEYvkjNVlly1/UPHOnSSjKCPToV66OnZqGxuBY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerry Lee , Theodore Tso Subject: [PATCH 4.19 224/229] ext4: continue to expand file system when the target size doesnt reach Date: Mon, 24 Oct 2022 13:32:23 +0200 Message-Id: <20221024113006.512522416@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747612374805601749?= X-GMAIL-MSGID: =?utf-8?q?1747612374805601749?= From: Jerry Lee 李修賢 commit df3cb754d13d2cd5490db9b8d536311f8413a92e upstream. When expanding a file system from (16TiB-2MiB) to 18TiB, the operation exits early which leads to result inconsistency between resize2fs and Ext4 kernel driver. === before === ○ → resize2fs /dev/mapper/thin resize2fs 1.45.5 (07-Jan-2020) Filesystem at /dev/mapper/thin is mounted on /mnt/test; on-line resizing required old_desc_blocks = 2048, new_desc_blocks = 2304 The filesystem on /dev/mapper/thin is now 4831837696 (4k) blocks long. [ 865.186308] EXT4-fs (dm-5): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none. [ 912.091502] dm-4: detected capacity change from 34359738368 to 38654705664 [ 970.030550] dm-5: detected capacity change from 34359734272 to 38654701568 [ 1000.012751] EXT4-fs (dm-5): resizing filesystem from 4294966784 to 4831837696 blocks [ 1000.012878] EXT4-fs (dm-5): resized filesystem to 4294967296 === after === [ 129.104898] EXT4-fs (dm-5): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none. [ 143.773630] dm-4: detected capacity change from 34359738368 to 38654705664 [ 198.203246] dm-5: detected capacity change from 34359734272 to 38654701568 [ 207.918603] EXT4-fs (dm-5): resizing filesystem from 4294966784 to 4831837696 blocks [ 207.918754] EXT4-fs (dm-5): resizing filesystem from 4294967296 to 4831837696 blocks [ 207.918758] EXT4-fs (dm-5): Converting file system to meta_bg [ 207.918790] EXT4-fs (dm-5): resizing filesystem from 4294967296 to 4831837696 blocks [ 221.454050] EXT4-fs (dm-5): resized to 4658298880 blocks [ 227.634613] EXT4-fs (dm-5): resized filesystem to 4831837696 Signed-off-by: Jerry Lee Link: https://lore.kernel.org/r/PU1PR04MB22635E739BD21150DC182AC6A18C9@PU1PR04MB2263.apcprd04.prod.outlook.com Signed-off-by: Theodore Ts'o Signed-off-by: Greg Kroah-Hartman --- fs/ext4/resize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -2092,7 +2092,7 @@ retry: goto out; } - if (ext4_blocks_count(es) == n_blocks_count) + if (ext4_blocks_count(es) == n_blocks_count && n_blocks_count_retry == 0) goto out; err = ext4_alloc_flex_bg_array(sb, n_group + 1);