fix: df: filter filesystem types after mount point resolution #7452
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
|
Could you please add a test to make sure we don't regress? |
|
@sylvestre I have now added coverage by expanding an existing test, let me know what you think. I assumed that |
|
GNU testsuite comparison: |
|
This may also fix issue #6073 which relates to nested mounts having different filesystem types |
|
sorry but could you please rebase the patch ? sorry again |
ba03926 to
8f22549
Compare
|
GNU testsuite comparison: |
8f22549 to
dab13ed
Compare
|
GNU testsuite comparison: |
|
@sylvestre done |
|
thanks and sorry for the latency! |
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.
This PR fixes #6194 .
When
dfreceives both a-ttype filter and file paths, the mount point for each path must be determined before the filesystem type filter is applied.The cause of this bug was that the filtering was applied at
coreutils/src/uu/df/src/df.rs
Line 387 in e147063
coreutils/src/uu/df/src/df.rs
Line 403 in e147063
This led to mount points being incorrectly determined for paths in some cases. For instance, on MacOS
cargo run df -a -t apfs /devwould print the mount point at/. More examples are given in #6194The fix was to re-order filtering and mount point resolution.