|
 |
e427d2 |
From 5ddac7d248ad346b80702a397c886df4d1ec4f08 Mon Sep 17 00:00:00 2001
|
|
|
e427d2 |
From: Jan Kara <jack@suse.cz>
|
|
|
e427d2 |
Date: Thu, 13 Feb 2020 11:15:57 +0100
|
|
|
e427d2 |
Subject: [PATCH 05/46] e2fsck: fix indexed dir rehash failure with
|
|
|
e427d2 |
metadata_csum enabled
|
|
|
e427d2 |
Content-Type: text/plain
|
|
|
e427d2 |
|
|
|
e427d2 |
E2fsck directory rehashing code can fail with ENOSPC due to a bug in
|
|
|
e427d2 |
ext2fs_htree_intnode_maxrecs() which fails to take metadata checksum
|
|
|
e427d2 |
into account and thus e.g. e2fsck can decide to create 1 indirect level
|
|
|
e427d2 |
of index tree when two are actually needed. Fix the logic to account for
|
|
|
e427d2 |
metadata checksum.
|
|
|
e427d2 |
|
|
|
e427d2 |
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
|
|
|
e427d2 |
Signed-off-by: Jan Kara <jack@suse.cz>
|
|
|
e427d2 |
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
|
|
e427d2 |
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
|
|
|
e427d2 |
---
|
|
|
e427d2 |
lib/ext2fs/ext2fs.h | 8 +++++++-
|
|
|
e427d2 |
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
e427d2 |
|
|
|
e427d2 |
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
|
|
|
e427d2 |
index 32c75171..d9aec525 100644
|
|
|
e427d2 |
--- a/lib/ext2fs/ext2fs.h
|
|
|
e427d2 |
+++ b/lib/ext2fs/ext2fs.h
|
|
|
e427d2 |
@@ -2040,7 +2040,13 @@ _INLINE_ blk_t ext2fs_inode_data_blocks(ext2_filsys fs,
|
|
|
e427d2 |
|
|
|
e427d2 |
_INLINE_ int ext2fs_htree_intnode_maxrecs(ext2_filsys fs, int blocks)
|
|
|
e427d2 |
{
|
|
|
e427d2 |
- return blocks * ((fs->blocksize - 8) / sizeof(struct ext2_dx_entry));
|
|
|
e427d2 |
+ int csum_size = 0;
|
|
|
e427d2 |
+
|
|
|
e427d2 |
+ if ((EXT2_SB(fs->super)->s_feature_ro_compat &
|
|
|
e427d2 |
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) != 0)
|
|
|
e427d2 |
+ csum_size = sizeof(struct ext2_dx_tail);
|
|
|
e427d2 |
+ return blocks * ((fs->blocksize - (8 + csum_size)) /
|
|
|
e427d2 |
+ sizeof(struct ext2_dx_entry));
|
|
|
e427d2 |
}
|
|
|
e427d2 |
|
|
|
e427d2 |
/*
|
|
|
e427d2 |
--
|
|
|
e427d2 |
2.35.1
|
|
|
e427d2 |
|