From: Theodore Ts'o <tytso@mit.edu>
To: Ext4 Developers List <linux-ext4@vger.kernel.org>
Cc: abuchbinder@google.com, Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH 1/5] e2fsck: quiet some harmless bitmap warnings
Date: Sun, 23 Jul 2017 00:50:31 -0400 [thread overview]
Message-ID: <20170723045035.26019-1-tytso@mit.edu> (raw)
E2fsck checks block numbers against the block_metadata_map before it
checks to see whether or not the block numbers are valid. So suppress
these harmless warnings.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
e2fsck/pass1.c | 2 ++
tests/f_ind_inode_collision/expect.1 | 1 -
tests/f_itable_collision/expect.1 | 8 --------
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 160e677ab..c358eec0f 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -2710,6 +2710,7 @@ report_problem:
* will reallocate the block; then we can try again.
*/
if (pb->ino != EXT2_RESIZE_INO &&
+ extent.e_pblk < ctx->fs->super->s_blocks_count &&
ext2fs_test_block_bitmap2(ctx->block_metadata_map,
extent.e_pblk)) {
next_try_repairs = 0;
@@ -3448,6 +3449,7 @@ static int process_block(ext2_filsys fs,
*/
if (blockcnt < 0 &&
p->ino != EXT2_RESIZE_INO &&
+ blk < ctx->fs->super->s_blocks_count &&
ext2fs_test_block_bitmap2(ctx->block_metadata_map, blk)) {
pctx->blk = blk;
fix_problem(ctx, PR_1_CRITICAL_METADATA_COLLISION, pctx);
diff --git a/tests/f_ind_inode_collision/expect.1 b/tests/f_ind_inode_collision/expect.1
index 012cd9ffb..63c128b44 100644
--- a/tests/f_ind_inode_collision/expect.1
+++ b/tests/f_ind_inode_collision/expect.1
@@ -2,7 +2,6 @@ Pass 1: Checking inodes, blocks, and sizes
Inode 12 block 41 conflicts with critical metadata, skipping block checks.
Inode 12 block 40 conflicts with critical metadata, skipping block checks.
Inode 12 block 34 conflicts with critical metadata, skipping block checks.
-Illegal block number passed to ext2fs_test_block_bitmap #16777215 for metadata block map
Inode 12 block 1 conflicts with critical metadata, skipping block checks.
Inode 12, i_size is 33, should be 25227264. Fix? yes
diff --git a/tests/f_itable_collision/expect.1 b/tests/f_itable_collision/expect.1
index 00cdced80..01c85d4d2 100644
--- a/tests/f_itable_collision/expect.1
+++ b/tests/f_itable_collision/expect.1
@@ -12,23 +12,15 @@ Inodes that were part of a corrupted orphan linked list found. Fix? yes
Inode 49 was part of the orphaned inode list. FIXED.
Inode 14 block 36 conflicts with critical metadata, skipping block checks.
-Illegal block number passed to ext2fs_test_block_bitmap #4294967295 for metadata block map
Inode 14 has illegal block(s). Clear? yes
Illegal indirect block (4294967295) in inode 14. CLEARED.
-Illegal block number passed to ext2fs_test_block_bitmap #4294967295 for metadata block map
Illegal indirect block (4294967295) in inode 14. CLEARED.
-Illegal block number passed to ext2fs_test_block_bitmap #4294967295 for metadata block map
Illegal indirect block (4294967295) in inode 14. CLEARED.
-Illegal block number passed to ext2fs_test_block_bitmap #4294967295 for metadata block map
Illegal indirect block (4294967295) in inode 14. CLEARED.
-Illegal block number passed to ext2fs_test_block_bitmap #4294967295 for metadata block map
Illegal indirect block (4294967295) in inode 14. CLEARED.
-Illegal block number passed to ext2fs_test_block_bitmap #4294967295 for metadata block map
Illegal indirect block (4294967295) in inode 14. CLEARED.
-Illegal block number passed to ext2fs_test_block_bitmap #4294967295 for metadata block map
Illegal indirect block (4294967295) in inode 14. CLEARED.
-Illegal block number passed to ext2fs_test_block_bitmap #4294967295 for metadata block map
Too many illegal blocks in inode 14.
Clear inode? yes
--
2.11.0.rc0.7.gbe5a750
next reply other threads:[~2017-07-23 4:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-23 4:50 Theodore Ts'o [this message]
2017-07-23 4:50 ` [PATCH 2/5] e2fsck: don't restart after a critical metadata collision in e2fsck -n mode Theodore Ts'o
2017-07-23 4:50 ` [PATCH 3/5] libext2fs: add stricter checks on the inode size in ext2fs_open2() Theodore Ts'o
2017-07-23 4:50 ` [PATCH 4/5] debugfs: add sanity checking to the string_to_inode() utility function Theodore Ts'o
2017-07-23 4:50 ` [PATCH 5/5] resize2fs: sanity check the free blocks and inode counts Theodore Ts'o
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=20170723045035.26019-1-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=abuchbinder@google.com \
--cc=linux-ext4@vger.kernel.org \
/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).