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

tklauser · tklauser · commit f2bed8ffb9db · 2017-08-09T13:43:12.000+02:00
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 &lt;tklauser@distanz.ch&gt;
diff --git a/fs/copy_linux.go b/fs/copy_linux.go
@@ -37,7 +37,7 @@ func copyFileContent(dst, src *os.File) error {
 		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 != unix.ENOSYS && err != unix.EXDEV {
 			return errors.Wrap(err, "copy file range failed")

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