From 82bdd310248b6c24d6495211aad3fed2eacaec14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Fri, 31 Dec 2021 17:25:24 +0100
Subject: [PATCH] ext2: the offset still can be equal to the block size with
 metacsum

fix assert check for _CheckBlock()

Change-Id: Ibf0052a24e4b2fbcfff1e4a10d556cc4e6a6b103
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4843
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
---
 .../file_systems/ext2/DirectoryIterator.cpp   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/ext2/DirectoryIterator.cpp b/src/add-ons/kernel/file_systems/ext2/DirectoryIterator.cpp
index 1a22d21a9b..89f6d236e3 100644
--- a/src/add-ons/kernel/file_systems/ext2/DirectoryIterator.cpp
+++ b/src/add-ons/kernel/file_systems/ext2/DirectoryIterator.cpp
@@ -99,7 +99,7 @@ DirectoryIterator::Get(char* name, size_t* _nameLength, ino_t* _id)
 	if (block == NULL)
 		return B_IO_ERROR;
 
-	ASSERT(_CheckBlock(block));
+	ASSERT(_CheckBlock(block) == B_OK);
 
 	TRACE("DirectoryIterator::Get(): Displacement: %" B_PRIu32 "\n",
 		fDisplacement);
@@ -168,8 +168,7 @@ DirectoryIterator::Next()
 	if (block == NULL)
 		return B_IO_ERROR;
 
-	ASSERT(_CheckBlock(block));
-	uint32 maxSize = _MaxSize();
+	ASSERT(_CheckBlock(block) == B_OK);
 
 	entry = (ext2_dir_entry*)(block + fDisplacement);
 
@@ -186,9 +185,9 @@ DirectoryIterator::Next()
 			fPreviousDisplacement = fDisplacement;
 			fDisplacement += entry->Length();
 		} else 
-			fDisplacement = maxSize;
+			fDisplacement = fBlockSize;
 
-		if (fDisplacement == maxSize) {
+		if (fDisplacement == fBlockSize) {
 			TRACE("Reached end of block\n");
 
 			fDisplacement = 0;
@@ -209,9 +208,9 @@ DirectoryIterator::Next()
 			block = cached.SetTo(fPhysicalBlock);
 			if (block == NULL)
 				return B_IO_ERROR;
-			ASSERT(_CheckBlock(block));
+			ASSERT(_CheckBlock(block) == B_OK);
 
-		} else if (fDisplacement > maxSize) {
+		} else if (fDisplacement > fBlockSize) {
 			TRACE("The entry isn't block aligned.\n");
 			// TODO: Is block alignment obligatory?
 			return B_BAD_DATA;
@@ -383,7 +382,7 @@ DirectoryIterator::RemoveEntry(Transaction& transaction)
 
 		fDirectory->SetDirEntryChecksum(block);
 
-		ASSERT(_CheckBlock(block));
+		ASSERT(_CheckBlock(block) == B_OK);
 
 		return B_OK;
 	}
@@ -416,7 +415,7 @@ DirectoryIterator::RemoveEntry(Transaction& transaction)
 
 	fDirectory->SetDirEntryChecksum(block);
 
-	ASSERT(_CheckBlock(block));
+	ASSERT(_CheckBlock(block) == B_OK);
 
 	return B_OK;
 }
@@ -438,7 +437,7 @@ DirectoryIterator::ChangeEntry(Transaction& transaction, ino_t id,
 
 	fDirectory->SetDirEntryChecksum(block);
 
-	ASSERT(_CheckBlock(block));
+	ASSERT(_CheckBlock(block) == B_OK);
 
 	return B_OK;
 }
@@ -452,7 +451,7 @@ DirectoryIterator::_AllocateBestEntryInBlock(uint8 nameLength, uint16& pos,
 	CachedBlock cached(fVolume);
 	const uint8* block = cached.SetTo(fPhysicalBlock);
 
-	ASSERT(_CheckBlock(block));
+	ASSERT(_CheckBlock(block) == B_OK);
 
 	uint16 requiredLength = EXT2_DIR_REC_LEN(nameLength);
 	uint32 maxSize = _MaxSize();
@@ -534,7 +533,7 @@ DirectoryIterator::_AddEntry(Transaction& transaction, const char* name,
 
 	fDirectory->SetDirEntryChecksum(block);
 
-	ASSERT(_CheckBlock(block));
+	ASSERT(_CheckBlock(block) == B_OK);
 
 	TRACE("DirectoryIterator::_AddEntry(): Done\n");
 
@@ -800,8 +799,8 @@ DirectoryIterator::_SplitIndexedBlock(Transaction& transaction,
 
 	fDirectory->SetDirEntryChecksum(secondBlock);
 
-	ASSERT(_CheckBlock(firstBlock));
-	ASSERT(_CheckBlock(secondBlock));
+	ASSERT(_CheckBlock(firstBlock) == B_OK);
+	ASSERT(_CheckBlock(secondBlock) == B_OK);
 
 	TRACE("DirectoryIterator::_SplitIndexedBlock(): Done\n");
 	return B_OK;
@@ -847,7 +846,7 @@ DirectoryIterator::_CheckDirEntry(const ext2_dir_entry* dirEntry, const uint8* b
 		errmsg = "Length is too big for the blocksize";
 	}
 
-	TRACE("DirectoryIterator::_CheckDirEntry() %s\n", errmsg);
+	TRACE("DirectoryIterator::_CheckDirEntry() %s\n", errmsg != NULL ? errmsg : "null");
 	return errmsg == NULL;
 }
 
@@ -898,7 +897,8 @@ DirectoryIterator::_HTreeRootChecksum(uint8* block, uint16 offset, uint16 count)
 	checksum = calculate_crc32c(checksum, (uint8*)&gen, sizeof(gen));
 	checksum = calculate_crc32c(checksum, block,
 		offset + count * sizeof(HTreeEntry));
-	TRACE("HTreeEntryIterator::_HTreeRootChecksum() size %u\n", offset + count * sizeof(HTreeEntry));
+	TRACE("HTreeEntryIterator::_HTreeRootChecksum() size %" B_PRIu64 "\n",
+		offset + count * sizeof(HTreeEntry));
 	ext2_htree_tail dummy;
 	dummy.reserved = 0;
 	checksum = calculate_crc32c(checksum, (uint8*)&dummy, sizeof(dummy));