From 5984d3961a7e5db4f03fb74cd1adba6d5a6a9bcd Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 5 Jul 2014 19:17:31 -0400 Subject: [PATCH] add patch clarify-ext4_mb_generate_buddy-error-message --- clarify-ext4_mb_generate_buddy-error-message | 26 ++++++++++++++++++++++++++ series | 1 + 2 files changed, 27 insertions(+) create mode 100644 clarify-ext4_mb_generate_buddy-error-message diff --git a/clarify-ext4_mb_generate_buddy-error-message b/clarify-ext4_mb_generate_buddy-error-message new file mode 100644 index 00000000..615d6589 --- /dev/null +++ b/clarify-ext4_mb_generate_buddy-error-message @@ -0,0 +1,26 @@ +ext4: clarify ext4_error message in ext4_mb_generate_buddy_error() + +We are spending a lot of time explaining to users what this error +means. Let's try to improve the message to avoid this problem. + +Signed-off-by: Theodore Ts'o +Cc: stable@vger.kernel.org +--- + fs/ext4/mballoc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c +index 7f72f50..2dcb936 100644 +--- a/fs/ext4/mballoc.c ++++ b/fs/ext4/mballoc.c +@@ -752,8 +752,8 @@ void ext4_mb_generate_buddy(struct super_block *sb, + + if (free != grp->bb_free) { + ext4_grp_locked_error(sb, group, 0, 0, +- "%u clusters in bitmap, %u in gd; " +- "block bitmap corrupt.", ++ "block bitmap and bg descriptor " ++ "inconsistent: %u vs %u free clusters", + free, grp->bb_free); + /* + * If we intend to continue, we consider group descriptor diff --git a/series b/series index 5d50d110..b6c405a9 100644 --- a/series +++ b/series @@ -2,6 +2,7 @@ fix-unjournaled-bg-descriptor-while-initializing-inode-bitmap clarify-error-count-warning +clarify-ext4_mb_generate_buddy-error-message remove-metadata-reservation-checks fix-punch-hole-on-files-with-indirect-mapping -- 2.11.4.GIT