From patchwork Wed Oct 19 08:28:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4760 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp214738wrs; Wed, 19 Oct 2022 02:13:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM63aLjRFIodP3qar6xBf4lr9N+ZcK07n92zna8VBVmejoX0IvbqXSIuGjlEujAERo/8H4jx X-Received: by 2002:a17:906:974f:b0:791:98b8:c7d1 with SMTP id o15-20020a170906974f00b0079198b8c7d1mr5846537ejy.559.1666170819233; Wed, 19 Oct 2022 02:13:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666170819; cv=none; d=google.com; s=arc-20160816; b=Kz8p6W/zGEG+LosonOL9aGHmIdwoRfWu7xZC44Bg0d3xym9xCHVm3UbKpf021zJLKl 2CIu79GvMtBg2hK/mtBM7Kk08ig7BIu0WDN55Mq0oL58vTPU6b9O7Odtk4ZmNtLkJbE/ svsaGiFoDxTsv5/pDW2fNxLlOF+TjDobe49mKolJyKFLADIkYcPgm0YoGoDG1zsoQeO5 WrZTom/0Z1lRcj+TikkNbUWCCMT7GEeceUa/QttLH2Q0V6pWqJBAabRxtIW16/hbx2QI ZYOAzmuD3qaFNXCh91nc5YZamV2dDPu/zjhMNXtAT/5xA1Dx8U+9BYM/n4UI9iJoVtU8 fdNg== 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=050frssq81jcYpF8xXmQu2pfNH8fWlcaxVA965g3LDE=; b=Id897IT3E3nqWvxIweCxTfhfz3BGVqr+o+k1lLad6MN9fLGdMMUytmKtFyGxbgtNJP 7YTE4QSHDLuEYybZIu6v89MBlOh9Zzv0QMp4IkW+IQ9yWIb91Npx8xB0qBnnFnN3iIDa xke0GWhRAUe0TIC5RdeMZ9ER5MtDGD9+eTY7aEtx2ghK+wHFKn9owwoKUDrX0Mp8WPIk DruvyihDdUhV9uI9/7zXyae4wKD8DhVF3EGJLKkiivn6sv/gTdNm8Zn412uAxHZVpkbz t/nWZFujklGUCXmbxYTMB13GuhlRAzKfZE7yvBX4Z3povZI8PFtO+MjYon9S/qxCOHY6 Wuvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=igIpOlMe; 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 f30-20020a170906739e00b007829f6fed9dsi4351542ejl.232.2022.10.19.02.13.14; Wed, 19 Oct 2022 02:13:39 -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=igIpOlMe; 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 S232805AbiJSJLW (ORCPT + 99 others); Wed, 19 Oct 2022 05:11:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232557AbiJSJIi (ORCPT ); Wed, 19 Oct 2022 05:08:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 488F02EF5E; Wed, 19 Oct 2022 02:00:12 -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 D130661838; Wed, 19 Oct 2022 08:59:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA91AC433C1; Wed, 19 Oct 2022 08:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169964; bh=HJDN//PAUPr5qeuWQTD76jRmZZf65242mBt/Nyf+xQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=igIpOlMeGRXbBSPlHCpi293vR/qkKFdrLrGgW8pH5xFGMmhWcVc2ynQlqsaqNnpDX pDYLx9jM/7mFIxLNrlPLyzhhBhRdmbyJ56IBEYXrCME++mVbJ7tQlPE/y5Ge8eLrTT wKrmZnoo44NTrE1FC6BHvK+pcCQG1YlrunLvgX/U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerry Lee , Theodore Tso Subject: [PATCH 6.0 448/862] ext4: continue to expand file system when the target size doesnt reach Date: Wed, 19 Oct 2022 10:28:55 +0200 Message-Id: <20221019083309.767133515@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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?1747106733143252943?= X-GMAIL-MSGID: =?utf-8?q?1747106733143252943?= 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 @@ -2122,7 +2122,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);