From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Lukas Czerner <lczerner@redhat.com>,
Theodore Ts'o <tytso@mit.edu>, Sasha Levin <sashal@kernel.org>,
linux-ext4@vger.kernel.org
Subject: [PATCH AUTOSEL 4.9 04/27] ext4: report real fs size after failed resize
Date: Fri, 29 Mar 2019 20:55:30 -0400 [thread overview]
Message-ID: <20190330005555.28087-4-sashal@kernel.org> (raw)
In-Reply-To: <20190330005555.28087-1-sashal@kernel.org>
From: Lukas Czerner <lczerner@redhat.com>
[ Upstream commit 6c7328400e0488f7d49e19e02290ba343b6811b2 ]
Currently when the file system resize using ext4_resize_fs() fails it
will report into log that "resized filesystem to <requested block
count>". 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 <lczerner@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 e16fb545d441..aef2a24dc9f9 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -2047,6 +2047,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
next prev parent reply other threads:[~2019-03-30 1:02 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-30 0:55 [PATCH AUTOSEL 4.9 01/27] ARC: u-boot args: check that magic number is correct Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 02/27] perf/core: Restore mmap record type correctly Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 03/27] ext4: add missing brelse() in add_new_gdb_meta_bg() Sasha Levin
2019-03-30 0:55 ` Sasha Levin [this message]
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 05/27] ALSA: echoaudio: add a check for ioremap_nocache Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 06/27] ALSA: sb8: add a check for request_region Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 07/27] IB/mlx4: Fix race condition between catas error reset and aliasguid flows Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 08/27] mmc: davinci: remove extraneous __init annotation Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 09/27] ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 10/27] thermal/int340x_thermal: Add additional UUIDs Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 11/27] thermal/int340x_thermal: fix mode setting Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 12/27] tools/power turbostat: return the exit status of a command Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 13/27] perf config: Fix an error in the config template documentation Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 14/27] perf config: Fix a memory leak in collect_config() Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 15/27] perf build-id: Fix memory leak in print_sdt_events() Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 16/27] perf top: Fix error handling in cmd_top() Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 17/27] perf hist: Add missing map__put() in error case Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 18/27] perf evsel: Free evsel->counts in perf_evsel__exit() Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 19/27] perf tests: Fix a memory leak of cpu_map object in the openat_syscall_event_on_all_cpus test Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 20/27] perf tests: Fix a memory leak in test__perf_evsel__tp_sched_test() Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 21/27] irqchip/mbigen: Don't clear eventid when freeing an MSI Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 22/27] x86/hpet: Prevent potential NULL pointer dereference Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 23/27] x86/cpu/cyrix: Use correct macros for Cyrix calls on Geode processors Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 24/27] iommu/vt-d: Check capability before disabling protected memory Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 25/27] x86/hw_breakpoints: Make default case in hw_breakpoint_arch_parse() return an error Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 26/27] fix incorrect error code mapping for OBJECTID_NOT_FOUND Sasha Levin
2019-03-30 0:55 ` [PATCH AUTOSEL 4.9 27/27] ext4: prohibit fstrim in norecovery mode Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190330005555.28087-4-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=lczerner@redhat.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).