github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Use CopyFileRange from golang.org/x/sys/unix

Browse Source 
Use the CopyFileRange and Lsetxattr from golang.org/x/sys/unix instead
of their counterparts from github.com/containerd/continuity/sysx. These
are 1:1 replacements (except for the fd parameter types in
CopyFileRange).

This will eventually allow to remove these functions there as well.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
This commit is contained in:
Tobias Klauser 2017-08-09 11:41:44 +02:00
parent 4a6a2b9db0
commit f2bed8ffb9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/copy_linux.go
View File

@ -37,7 +37,7 @@ func copyFileContent(dst, src *os.File) error {
return errors.Wrap(err, "unable to stat source") return errors.Wrap(err, "unable to stat source")
} }
n, err := sysx.CopyFileRange(src.Fd(), nil, dst.Fd(), nil, int(st.Size()), 0) n, err := unix.CopyFileRange(int(src.Fd()), nil, int(dst.Fd()), nil, int(st.Size()), 0)
if err != nil { if err != nil {
if err != unix.ENOSYS && err != unix.EXDEV { if err != unix.ENOSYS && err != unix.EXDEV {
return errors.Wrap(err, "copy file range failed") return errors.Wrap(err, "copy file range failed")