Skip to content

Remove the unreachable partial last block group handling in the EXT4 formatter #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wlan0 merged 2 commits into from
Apr 4, 2026
+1 −24
Merged

Remove the unreachable partial last block group handling in the EXT4 formatter #640

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37d438b
Fix the last block group handling
dkovba Apr 3, 2026
fdeb5b5
Remove not used code
dkovba Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 1 addition & 24 deletions Sources/ContainerizationEXT4/EXT4+Formatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,16 +804,7 @@ extension EXT4 {
inodeBitmap[Int(i) / 8] &= ~(1 << (i % 8))
}
for group in blockGroupSize.blockGroups..<totalGroups.lo {
var blocksInGroup = UInt32(self.blocksPerGroup)
if group == totalGroups.lo {
if UInt64(self.size / UInt64(self.blockSize)) < self.blocksPerGroup {
break
}
blocksInGroup = UInt32((self.size / UInt64(self.blockSize)) % UInt64(self.blocksPerGroup))
if blocksInGroup == 0 {
break
}
}
let blocksInGroup = UInt32(self.blocksPerGroup)
let blockBitmapOffset = UInt64(group * self.blocksPerGroup + inodeTableSizePerGroup)
let inodeBitmapOffset = UInt64(group * self.blocksPerGroup + inodeTableSizePerGroup + 1)
let inodeTableOffset = UInt64(self.blocksPerGroup) * group
Expand All @@ -837,20 +828,6 @@ extension EXT4 {
))
totalBlocks += (inodeTableSizePerGroup + 2)
try self.seek(block: group * self.blocksPerGroup + inodeTableSizePerGroup)

if group == totalGroups.lo {
var blockBitmapLo: [UInt8] = .init(repeating: 0, count: Int(self.blocksPerGroup) / 8)
for i in blocksInGroup..<UInt32(self.blocksPerGroup) {
blockBitmapLo[Int(i) / 8] |= 1 << (i % 8)
}
for i in 0..<inodeTableSizePerGroup + 2 {
blockBitmapLo[Int(i) / 8] |= 1 << (i % 8)
}
try self.handle.write(contentsOf: blockBitmapLo)
try self.handle.write(contentsOf: inodeBitmap)
continue
}

try self.handle.write(contentsOf: blockBitmap)
try self.handle.write(contentsOf: inodeBitmap)
}
Expand Down
Loading