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.1 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 93E9CC10F0E for ; Thu, 18 Apr 2019 18:27:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5660A218AF for ; Thu, 18 Apr 2019 18:27:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555612028; bh=RuFa1+8xl5fvD/eNj1M4aNk6Yl9zZQxtIxZdR+bzvJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZwO3J8/ot/3EurmrsSuTgQjlzkkX+5Zxov59rEn5x5MY8e2ZmrSsmql3JdLi573jV uFAne6XvgtdRr1dTJbQjDYlUVkqDBZddT4Te0wmKZ21Jvha45IbXusV4scQ2bO2rt9 OR5sO/BjBQ4HQs3bbsKqJr2V8jpNPOT92+3VH6gE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391100AbfDRSEX (ORCPT ); Thu, 18 Apr 2019 14:04:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:33342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391097AbfDRSEW (ORCPT ); Thu, 18 Apr 2019 14:04:22 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 C62CB206B6; Thu, 18 Apr 2019 18:04:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555610662; bh=RuFa1+8xl5fvD/eNj1M4aNk6Yl9zZQxtIxZdR+bzvJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yCpM5oMJrNP4v7zpl0JW4xr65C9/NC2uX4shtzleYNdoJyuDSk+YLni9m4Id/ds1k jPVM+DUeMpu44tFu9cz3W5VpeqHfBLPR9Ef44pSLqpvFHBgjGZjvXJrpLB9V16voyA tngrpwK7mJgyJc9UrdMbUHY957XMFilEdksH4Ufg= 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 4.14 05/92] ext4: report real fs size after failed resize Date: Thu, 18 Apr 2019 19:56:23 +0200 Message-Id: <20190418160430.935807848@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418160430.325165109@linuxfoundation.org> References: <20190418160430.325165109@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 fb9fbf993e22..333fba05e1a5 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -2049,6 +2049,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