From patchwork Mon Oct 24 11:33:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9213 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp459219wru; Mon, 24 Oct 2022 06:39:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6EwP3/m5m3OsPHAW/zcqtpz6rCfMGx9TBhlYqIj+x2ZVA00gPRIGs5Bk9OP9SmfWtYCCbO X-Received: by 2002:a17:907:3f91:b0:78e:2fdc:92a3 with SMTP id hr17-20020a1709073f9100b0078e2fdc92a3mr26074486ejc.770.1666618747000; Mon, 24 Oct 2022 06:39:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666618746; cv=none; d=google.com; s=arc-20160816; b=LQeejj0pjkd2vw/62SPjJ2TcFhQWtMlJrTsTNgfdSCbuMSiY166WmNkjNhl6HX4OHL perh0Efh/qZByjaw8ihFWEgb1aOoF+Eiaijo5vG6iGy47gpMDtcJSAwCPdVDAVlXc52R 95+2mYna1JDgRgxwhxX40etVkD2wb4gzy69m5s5FNBQMIRvuhcjKH8X2A+sWk7/YMvYn LehTriFNgcYQ/Zu+LDHyyEZng7MIWo6/T/cg59zAhHeD7OtECBBSOPl/mwk5wvMX05WJ P3ipcYPTh9YdZUb8yp9LV0VMX7mRQZMyKj4zmlLhPAoEWjrlEom2ezXPJxZeoHwoFBP2 GkRg== 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=Dc6iPtvmGaWka3gqLYOd/VKNfy1Tpm1+rtnybA6VT6M=; b=EWNVAMTE+kQGE/PDWT2pxVSDYgSHeVcC/xNgzqCN+2Xsgq+Qi18uL53Uct/cbrFNrW RcoF/Zik3Rv6v7bwJtIYE1bOPZ8dyOvw0TxpcUbqT+q2HzIdUylDE/ZVQiETJY1I1D+k UdX8MTWG1n+bCtDnYCxwU9KYYkBE7NjLCuRTk3gUmvlu0lQGwbvnAx8xxRhyTIbb9NKp ZqtGQGSH2R4FEsH1+X6Elhr4JFH1R5dQ3XGVQahxlPYFp2ySLlw3wFgxHjYluJ8ko656 jRilXdI3pEOfwp94e31Q5BqbHEN+A39gO7+Ln34BwoOkVfDFJdp1HDsA/M7jzkhcYBAg fhmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=f9GmnhJc; 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 et3-20020a056402378300b004534c7d4ebfsi25988749edb.434.2022.10.24.06.38.42; Mon, 24 Oct 2022 06:39:06 -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=f9GmnhJc; 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 S232307AbiJXNfk (ORCPT + 99 others); Mon, 24 Oct 2022 09:35:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236347AbiJXNaw (ORCPT ); Mon, 24 Oct 2022 09:30:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBD0DACF6D; Mon, 24 Oct 2022 05:33:42 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 68C58612B2; Mon, 24 Oct 2022 12:33:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7728DC433D6; Mon, 24 Oct 2022 12:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614785; bh=m46WRPqwV8xo+n5ULSOirJuExbBMsPyhDHOI55Rofmw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f9GmnhJc/qb3oeMiPTLqDwQJLrJtYN3jgBmD0Le38hL5YlEYvGZqq/KMpnKN+ME9d 6Z/+Co/S2HBWExluObRv5I3lwZQDZ0NvhZNLG7ywg9tjegmbvkUPDGntwT2eCnh8qj sr7Pmoh/eXz5/i1Z+wgP2dQMCYeLbD3mf+A/oWRE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerry Lee , Theodore Tso Subject: [PATCH 5.10 386/390] ext4: continue to expand file system when the target size doesnt reach Date: Mon, 24 Oct 2022 13:33:03 +0200 Message-Id: <20221024113039.412630993@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@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?1747576419216741909?= X-GMAIL-MSGID: =?utf-8?q?1747576419216741909?= 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 @@ -2068,7 +2068,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);