Count bind mounts and repeated mounts once - #36
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
A bind mount inside the scanned folder gets walked like extra data, so its files count twice. The same happens with a second mount of a disk that's already inside the scan (
/dataand/mnt/data, say), or the top of a Btrfs filesystem mounted next to its subvolumes. Device numbers can't catch these because a bind mount has its source's device, and/proc/self/mountsdoesn't say which directory a mount shows./proc/self/mountinfodoes.This reads mountinfo and leaves out the extra view when the same directory would be reached twice. The view showing the widest part of the filesystem is kept, so subvolumes like
/homeare scanned as before. The scanned root itself is never skipped. Without mountinfo (macOS, Windows) nothing changes.To reproduce on main without root:
Main counts the file twice; this branch counts it once.
Tests: unit tests for an Omarchy-style table (subvolumes are not repeats, a second mount of the data disk is), a bind of a subfolder, the Btrfs top level, and mountinfo's octal escapes. I also checked real bind mounts in a user namespace, and a scan of
/on a machine without repeated mounts gives the same total as main.cargo xtask lintandcargo xtask testpass.