Skip to content
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

Jump to bottom

Workarounds for copy_file_range issues #75428

Merged
merged 3 commits into from
Sep 5, 2020
Merged

Workarounds for copy_file_range issues #75428

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1316c78
Workaround for copy_file_range spuriously returning EOPNOTSUPP when a…
the8472 Aug 11, 2020
f078363
more concise error matching
the8472 Aug 12, 2020
4ddedd5
perform copy_file_range until EOF is reached instead of basing things…
the8472 Aug 14, 2020
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
12 changes: 5 additions & 7 deletions library/std/src/sys/unix/fs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,7 +1162,7 @@ pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
};
if let Err(ref copy_err) = copy_result {
match copy_err.raw_os_error() {
Some(libc::ENOSYS) | Some(libc::EPERM) => {
Some(libc::ENOSYS | libc::EPERM | libc::EOPNOTSUPP) => {
the8472 marked this conversation as resolved.
Show resolved Hide resolved
HAS_COPY_FILE_RANGE.store(false, Ordering::Relaxed);
}
_ => {}
Expand All @@ -1176,15 +1176,13 @@ pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
Ok(ret) => written += ret as u64,
Err(err) => {
match err.raw_os_error() {
Some(os_err)
if os_err == libc::ENOSYS
|| os_err == libc::EXDEV
|| os_err == libc::EINVAL
|| os_err == libc::EPERM =>
{
Some(
libc::ENOSYS | libc::EXDEV | libc::EINVAL | libc::EPERM | libc::EOPNOTSUPP,
) => {
// Try fallback io::copy if either:
// - Kernel version is < 4.5 (ENOSYS)
// - Files are mounted on different fs (EXDEV)
// - copy_file_range is broken in various ways on RHEL/CentOS 7 (EOPNOTSUPP)
the8472 marked this conversation as resolved.
Show resolved Hide resolved
// - copy_file_range is disallowed, for example by seccomp (EPERM)
// - copy_file_range cannot be used with pipes or device nodes (EINVAL)
assert_eq!(written, 0);
Expand Down