Skip to content

df: simplify fn find_mount_point #13916

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
sylvestre merged 1 commit into from
Aug 13, 2026
Merged

df: simplify fn find_mount_point #13916

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 3 additions & 11 deletions src/uu/df/src/filesystem.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,15 @@ pub(crate) fn find_mount_point<P: AsRef<Path>>(path: P) -> io::Result<PathBuf> {
let mut current = path.as_ref().canonicalize()?;
let current_dev = current.metadata()?.dev();

loop {
let parent = match current.parent() {
Some(p) if !p.as_os_str().is_empty() => p,
_ => return Ok(current),
};

while let Some(parent) = current.parent().filter(|p| !p.as_os_str().is_empty()) {
let parent_dev = parent.metadata()?.dev();
if parent_dev != current_dev {
return Ok(current);
}

if parent == current {
if parent_dev != current_dev || parent == current {
return Ok(current);
}

current = parent.to_path_buf();
}
Ok(current)
}

/// Find the mount info that best matches a given filesystem path.
Expand Down
Loading