summaryrefslogtreecommitdiffstats
path: root/fs
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-27 09:33:56 +0200
commit0e9bb07a374ae378d45ce0c159504a3a2eb0fe72 (patch)
treea6b4efbce7e38834697156ceec2f0cf8052e928d /fs
parentd8ef8e9465ef976f3b8a61d9b453947b2d144d73 (diff)
downloadlinux-stable-0e9bb07a374ae378d45ce0c159504a3a2eb0fe72.tar.gz
linux-stable-0e9bb07a374ae378d45ce0c159504a3a2eb0fe72.tar.bz2
linux-stable-0e9bb07a374ae378d45ce0c159504a3a2eb0fe72.zip
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')
-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 22c90eb9a4e0..5223eb25bf59 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -2047,6 +2047,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;
}