From patchwork Mon Oct 24 11:32:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9693 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp543887wru; Mon, 24 Oct 2022 09:30:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Y/NJTCm6dUIhDmI9aUcBUBvC2njJvJ904ifbMll0kXqmNTzKY2Tb3NnJQp8bltArxTpGX X-Received: by 2002:a17:906:7952:b0:787:a14d:65a7 with SMTP id l18-20020a170906795200b00787a14d65a7mr28620533ejo.108.1666629057316; Mon, 24 Oct 2022 09:30:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666629057; cv=none; d=google.com; s=arc-20160816; b=RhI8/OSTcSpp0IXpU0FeLcBUWT1ZrHDO8XogSQrljYXA7lFpnC6npYfX+boTIn3C8e fzX7x2v+ne59tp4Urr14VI2MNhgxNzT+mjDakNjbu6Jo0pgpk0RAPMINzfsLYN+Ocznr 3xz1xpUecc/QlBD5kPZLQsHfLnScnJF8+owOHbELSVF6a0p5ttzUKBd6bKdexzu1BTIF Q7Y7BCZlmWMrwyrfUL7zQf7K4+0pacJGlcKURVMd4VgkCpoWr2odR5RfCtaxic91Hn8H zHxxU/nCnB7oGUE8Gv/GFm9YX7nth0U0ymhmjhkaTNAOdti9cO4EcFHvT+uIqXs7Yy2j vxkA== 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=yyBP1ee1zaBdqPAXJDDKXudQKq8a2xpdxA0ShsLGnHk=; b=ijO1tNGfHUio8dJUcG+P8cxxKHKh6m/isDXL6Bw/II77PmdayYRW3ygmA1vgEZY+l/ PBWajvkYfSHiSmKcLZPaogKv7JkcxT089RQkF1hMTbJa3Gq5eoLu6lVf0JCUVp3vMVUh DgX0qQgLVz5dY8Vto256El+cKrrPEEL5v9sh8y+FO4hbNM8IkrNbv8xATO/lKromq2J5 HI9iX1ZKAIIwtBqo+6wDqm5gDjkAxLxO+SQLXHEG4YPUGxeORrI0GV4qMYAy5ORCW32G V3UpCbMlw0JSeoM+/8uhCCKOsM9imWnX6K/nB1cuSGuFoKXJ+1nNxxn28uXgSuBRehiZ X7WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iRj5poff; 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 hv11-20020a17090760cb00b007824b85978asi190814ejc.81.2022.10.24.09.30.33; Mon, 24 Oct 2022 09:30:57 -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=iRj5poff; 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 S231205AbiJXQPv (ORCPT + 99 others); Mon, 24 Oct 2022 12:15:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230092AbiJXQNn (ORCPT ); Mon, 24 Oct 2022 12:13:43 -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 88192E099B; Mon, 24 Oct 2022 08:02:07 -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 7A1CDB81629; Mon, 24 Oct 2022 12:16:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0EA9C433D7; Mon, 24 Oct 2022 12:16:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613771; bh=BMKP81An3DVtiRKCWskDLbP4VdOzHunvWVzA0laQJNk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iRj5poffXj2JZStYU6W9y7RvxMPhJRkwHcNL923JAbQM84Gn6dWwFcSLLk/RYqm8s vGBAQZ3OR4EoygFJUeWj/MxTPcwfNfoEECc6xK809vkuCNmJtQdOu1zWp6ZF0Q78Wy dLAlExomiVwkKJYOdHvHWZ8EHfTZ483nCw2vgYPw= 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.4 251/255] ext4: continue to expand file system when the target size doesnt reach Date: Mon, 24 Oct 2022 13:32:41 +0200 Message-Id: <20221024113011.659338565@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@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?1747587230353025082?= X-GMAIL-MSGID: =?utf-8?q?1747587230353025082?= 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 @@ -2090,7 +2090,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);