From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B5DDC282E1 for ; Wed, 24 Apr 2019 18:11:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 337DA20652 for ; Wed, 24 Apr 2019 18:11:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556129495; bh=dwkeecMG7ufSx1wgDduX4D3cARPbIc0I997Bd+wuhg4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jyJ+3Dko7L5mpvAAC6+RMMiIvlEzRwPrIb335Oc3qKVT8HrNO/TiXZg9FREkfkrqF Gt3ZPe4GxUeoaeWVJBb+DrFqbceNIxKZt889rXS2NqO9JQR5LBQ7N2FRbIsA/otu1x bfNf+El3YFzgcG9gbloRhQ0bSQpBoTTLJRGUAVIM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387913AbfDXRNi (ORCPT ); Wed, 24 Apr 2019 13:13:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:37668 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387904AbfDXRNe (ORCPT ); Wed, 24 Apr 2019 13:13:34 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0CD13218FE; Wed, 24 Apr 2019 17:13:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126014; bh=dwkeecMG7ufSx1wgDduX4D3cARPbIc0I997Bd+wuhg4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s6+DC983B6kLdSQHK12v2OGNuW53XfGVxd6cZdXD2f0Z8/Dj6N3L38DWD9qt08ZXv ks5rBrVOeAaWMXmJb30fVU5feAhDgfOIzmbQDfVJhfdhK/Ahae+5pL86PWdVdcuvzW Z77DZ6xRteEU5LpnoToxOfiU1RAQsyscY0+opQ9k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lukas Czerner , Theodore Tso , Sasha Levin Subject: [PATCH 3.18 062/104] ext4: report real fs size after failed resize Date: Wed, 24 Apr 2019 19:09:19 +0200 Message-Id: <20190424170904.313975064@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170839.996641496@linuxfoundation.org> References: <20190424170839.996641496@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 6c7328400e0488f7d49e19e02290ba343b6811b2 ] Currently when the file system resize using ext4_resize_fs() fails it will report into log that "resized filesystem to ". However this may not be true in the case of failure. Use the current block count as returned by ext4_blocks_count() to report the block count. Additionally, report a warning that "error occurred during file system resize" Signed-off-by: Lukas Czerner Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/resize.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 96372539dc06..196b9d3fa3b9 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -2042,6 +2042,10 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count) free_flex_gd(flex_gd); if (resize_inode != NULL) iput(resize_inode); - ext4_msg(sb, KERN_INFO, "resized filesystem to %llu", n_blocks_count); + if (err) + ext4_warning(sb, "error (%d) occurred during " + "file system resize", err); + ext4_msg(sb, KERN_INFO, "resized filesystem to %llu", + ext4_blocks_count(es)); return err; } -- 2.19.1