diff --git a/content/store.go b/content/store.go index bc7b053..e43dcc3 100644 --- a/content/store.go +++ b/content/store.go @@ -159,7 +159,7 @@ func (s *Store) status(ingestPath string) (Status, error) { var startedAt time.Time if st, ok := fi.Sys().(*syscall.Stat_t); ok { - startedAt = time.Unix(st.Ctim.Sec, st.Ctim.Nsec) + startedAt = time.Unix(int64(st.Ctim.Sec), int64(st.Ctim.Nsec)) } else { startedAt = fi.ModTime() } diff --git a/vendor.conf b/vendor.conf index 20b043c..643cc72 100644 --- a/vendor.conf +++ b/vendor.conf @@ -14,7 +14,7 @@ github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93 github.com/opencontainers/runc ce450bcc6c135cae93ee2a99d41a308c179ff6dc github.com/opencontainers/runtime-spec 035da1dca3dfbb00d752eb58b0b158d6129f3776 github.com/Sirupsen/logrus v0.11.0 -github.com/stevvooe/go-btrfs 8539a1d04898663b8eda14982e24b74e7a12388e +github.com/stevvooe/go-btrfs ea304655a3ed8f00773db1844f921d12541ee0d1 github.com/stretchr/testify v1.1.4 github.com/davecgh/go-spew v1.1.0 github.com/pmezard/go-difflib v1.0.0 @@ -27,7 +27,7 @@ github.com/nightlyone/lockfile 1d49c987357a327b5b03aa84cbddd582c328615d github.com/opencontainers/go-digest 21dfd564fd89c944783d00d069f33e3e7123c448 golang.org/x/sys/unix d75a52659825e75fff6158388dddc6a5b04f9ba5 github.com/opencontainers/image-spec a431dbcf6a74fca2e0e040b819a836dbe3fb23ca -github.com/stevvooe/continuity 1530f13d23b34e2ccaf33881fefecc7e28e3577b +github.com/stevvooe/continuity 577e137350afb00343495f55bb8671fe7e22b0bf golang.org/x/sync 450f422ab23cf9881c94e2db30cac0eb1b7cf80c github.com/BurntSushi/toml v0.2.0-21-g9906417 github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0 diff --git a/vendor/github.com/stevvooe/continuity/sysx/copy_linux_arm.go b/vendor/github.com/stevvooe/continuity/sysx/copy_linux_arm.go new file mode 100644 index 0000000..c1368c5 --- /dev/null +++ b/vendor/github.com/stevvooe/continuity/sysx/copy_linux_arm.go @@ -0,0 +1,20 @@ +// mksyscall.pl -l32 copy_linux.go +// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT + +package sysx + +import ( + "syscall" + "unsafe" +) + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func CopyFileRange(fdin uintptr, offin *int64, fdout uintptr, offout *int64, len int, flags int) (n int, err error) { + r0, _, e1 := syscall.Syscall6(SYS_COPY_FILE_RANGE, uintptr(fdin), uintptr(unsafe.Pointer(offin)), uintptr(fdout), uintptr(unsafe.Pointer(offout)), uintptr(len), uintptr(flags)) + n = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} diff --git a/vendor/github.com/stevvooe/continuity/sysx/sysnum_linux_arm.go b/vendor/github.com/stevvooe/continuity/sysx/sysnum_linux_arm.go new file mode 100644 index 0000000..a05dcbb --- /dev/null +++ b/vendor/github.com/stevvooe/continuity/sysx/sysnum_linux_arm.go @@ -0,0 +1,7 @@ +package sysx + +const ( + // SYS_COPY_FILE_RANGE defined in Kernel 4.5+ + // Number defined in /usr/include/arm-linux-gnueabihf/asm/unistd.h + SYS_COPY_FILE_RANGE = 391 +) diff --git a/vendor/github.com/stevvooe/go-btrfs/btrfs.go b/vendor/github.com/stevvooe/go-btrfs/btrfs.go index 81269ca..b4d9955 100644 --- a/vendor/github.com/stevvooe/go-btrfs/btrfs.go +++ b/vendor/github.com/stevvooe/go-btrfs/btrfs.go @@ -365,7 +365,7 @@ func openSubvolDir(path string) (*os.File, error) { } func isStatfsSubvol(statfs *syscall.Statfs_t) error { - if statfs.Type != C.BTRFS_SUPER_MAGIC { + if int64(statfs.Type) != int64(C.BTRFS_SUPER_MAGIC) { return errors.Errorf("not a btrfs filesystem") }