diff options
author | Lukas Czerner <lczerner@redhat.com> | 2019-03-15 00:22:28 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-20 09:15:55 +0200 |
commit | a793860c0f52f28d0d5f052a20981057eb9fb9f1 (patch) | |
tree | fe9b298760ae9cc10172af1544309ac1af6e9c64 | |
parent | f5a94fd3b375f44bcb27b81595b22f2f464a47d2 (diff) | |
download | linux-stable-a793860c0f52f28d0d5f052a20981057eb9fb9f1.tar.gz linux-stable-a793860c0f52f28d0d5f052a20981057eb9fb9f1.tar.bz2 linux-stable-a793860c0f52f28d0d5f052a20981057eb9fb9f1.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>
-rw-r--r-- | fs/ext4/resize.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 90061c3d048b..e7ae26e36c9c 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -2080,6 +2080,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; } |