summaryrefslogtreecommitdiff
path: root/fs/ext4
diff options
context:
space:
mode:
authorLukas Czerner <lczerner@redhat.com>2019-03-15 00:22:28 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-20 09:15:00 +0200
commitce1bdbed2097bffb0cabc8381f3727f8698ff991 (patch)
tree31d1ed48fd780c44f64fedd61ec5361d71977d03 /fs/ext4
parent7a82651d06cbaf2447f4f1193f4a7b325c1ab53a (diff)
ext4: report real fs size after failed resize
[ 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>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/resize.c6
1 files changed, 5 insertions, 1 deletions
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 @@ out:
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;
}