i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ext2: the offset still can be equal to the block size with metacsum

Browse Source 
fix assert check for _CheckBlock()

Change-Id: Ibf0052a24e4b2fbcfff1e4a10d556cc4e6a6b103
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4843
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Jérôme Duval
2022-01-03 21:09:38 +00:00
committed by waddlesplash
parent fd876ad749
commit 82bdd31024
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/ext2/DirectoryIterator.cpp
+16 -16
View File
@@ -99,7 +99,7 @@ DirectoryIterator::Get(char* name, size_t* _nameLength, ino_t* _id)
if (block == NULL) if (block == NULL)
return B_IO_ERROR; return B_IO_ERROR;
ASSERT(_CheckBlock(block)); ASSERT(_CheckBlock(block) == B_OK);
TRACE("DirectoryIterator::Get(): Displacement: %" B_PRIu32 "\n", TRACE("DirectoryIterator::Get(): Displacement: %" B_PRIu32 "\n",
fDisplacement); fDisplacement);
@@ -168,8 +168,7 @@ DirectoryIterator::Next()
if (block == NULL) if (block == NULL)
return B_IO_ERROR; return B_IO_ERROR;
ASSERT(_CheckBlock(block)); ASSERT(_CheckBlock(block) == B_OK);
uint32 maxSize = _MaxSize();
entry = (ext2_dir_entry*)(block + fDisplacement); entry = (ext2_dir_entry*)(block + fDisplacement);
@@ -186,9 +185,9 @@ DirectoryIterator::Next()
fPreviousDisplacement = fDisplacement; fPreviousDisplacement = fDisplacement;
fDisplacement += entry->Length(); fDisplacement += entry->Length();
} else } else
fDisplacement = maxSize; fDisplacement = fBlockSize;
if (fDisplacement == maxSize) { if (fDisplacement == fBlockSize) {
TRACE("Reached end of block\n"); TRACE("Reached end of block\n");
fDisplacement = 0; fDisplacement = 0;
@@ -209,9 +208,9 @@ DirectoryIterator::Next()
block = cached.SetTo(fPhysicalBlock); block = cached.SetTo(fPhysicalBlock);
if (block == NULL) if (block == NULL)
return B_IO_ERROR; 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"); TRACE("The entry isn't block aligned.\n");
// TODO: Is block alignment obligatory? // TODO: Is block alignment obligatory?
return B_BAD_DATA; return B_BAD_DATA;
@@ -383,7 +382,7 @@ DirectoryIterator::RemoveEntry(Transaction& transaction)
fDirectory->SetDirEntryChecksum(block); fDirectory->SetDirEntryChecksum(block);
ASSERT(_CheckBlock(block)); ASSERT(_CheckBlock(block) == B_OK);
return B_OK; return B_OK;
} }
@@ -416,7 +415,7 @@ DirectoryIterator::RemoveEntry(Transaction& transaction)
fDirectory->SetDirEntryChecksum(block); fDirectory->SetDirEntryChecksum(block);
ASSERT(_CheckBlock(block)); ASSERT(_CheckBlock(block) == B_OK);
return B_OK; return B_OK;
} }
@@ -438,7 +437,7 @@ DirectoryIterator::ChangeEntry(Transaction& transaction, ino_t id,
fDirectory->SetDirEntryChecksum(block); fDirectory->SetDirEntryChecksum(block);
ASSERT(_CheckBlock(block)); ASSERT(_CheckBlock(block) == B_OK);
return B_OK; return B_OK;
} }
@@ -452,7 +451,7 @@ DirectoryIterator::_AllocateBestEntryInBlock(uint8 nameLength, uint16& pos,
CachedBlock cached(fVolume); CachedBlock cached(fVolume);
const uint8* block = cached.SetTo(fPhysicalBlock); const uint8* block = cached.SetTo(fPhysicalBlock);
ASSERT(_CheckBlock(block)); ASSERT(_CheckBlock(block) == B_OK);
uint16 requiredLength = EXT2_DIR_REC_LEN(nameLength); uint16 requiredLength = EXT2_DIR_REC_LEN(nameLength);
uint32 maxSize = _MaxSize(); uint32 maxSize = _MaxSize();
@@ -534,7 +533,7 @@ DirectoryIterator::_AddEntry(Transaction& transaction, const char* name,
fDirectory->SetDirEntryChecksum(block); fDirectory->SetDirEntryChecksum(block);
ASSERT(_CheckBlock(block)); ASSERT(_CheckBlock(block) == B_OK);
TRACE("DirectoryIterator::_AddEntry(): Done\n"); TRACE("DirectoryIterator::_AddEntry(): Done\n");
@@ -800,8 +799,8 @@ DirectoryIterator::_SplitIndexedBlock(Transaction& transaction,
fDirectory->SetDirEntryChecksum(secondBlock); fDirectory->SetDirEntryChecksum(secondBlock);
ASSERT(_CheckBlock(firstBlock)); ASSERT(_CheckBlock(firstBlock) == B_OK);
ASSERT(_CheckBlock(secondBlock)); ASSERT(_CheckBlock(secondBlock) == B_OK);
TRACE("DirectoryIterator::_SplitIndexedBlock(): Done\n"); TRACE("DirectoryIterator::_SplitIndexedBlock(): Done\n");
return B_OK; 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"; 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; 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, (uint8*)&gen, sizeof(gen));
checksum = calculate_crc32c(checksum, block, checksum = calculate_crc32c(checksum, block,
offset + count * sizeof(HTreeEntry)); 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; ext2_htree_tail dummy;
dummy.reserved = 0; dummy.reserved = 0;
checksum = calculate_crc32c(checksum, (uint8*)&dummy, sizeof(dummy)); checksum = calculate_crc32c(checksum, (uint8*)&dummy, sizeof(dummy));