From 46ba3e7a1971708017c843c1034571ac252dd35f Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Fri, 27 Mar 2015 17:56:46 +0100 Subject: [PATCH] unix: re-run mksyscall on freebsd and linux after previous merge The previous cherry-pick merge of fadvice from Gerrit added the fadvise system calls, but from before the errno CL, which went in concurrently. Change-Id: I6f01e020bfe2930a8ea2fdbe4998ab9e2669ce14 Reviewed-on: https://go-review.googlesource.com/8199 Reviewed-by: Rob Pike --- unix/zsyscall_freebsd_386.go | 2 +- unix/zsyscall_freebsd_amd64.go | 2 +- unix/zsyscall_freebsd_arm.go | 2 +- unix/zsyscall_linux_386.go | 4 ++-- unix/zsyscall_linux_amd64.go | 2 +- unix/zsyscall_linux_arm.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/unix/zsyscall_freebsd_386.go b/unix/zsyscall_freebsd_386.go index 558b633a..eef8eca6 100644 --- a/unix/zsyscall_freebsd_386.go +++ b/unix/zsyscall_freebsd_386.go @@ -655,7 +655,7 @@ func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) ( func Fadvise(fd int, offset int64, length int64, advice int) (err error) { _, _, e1 := Syscall6(SYS_POSIX_FADVISE, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice)) if e1 != 0 { - err = e1 + err = errnoErr(e1) } return } diff --git a/unix/zsyscall_freebsd_amd64.go b/unix/zsyscall_freebsd_amd64.go index d0cd0b4a..507166bc 100644 --- a/unix/zsyscall_freebsd_amd64.go +++ b/unix/zsyscall_freebsd_amd64.go @@ -655,7 +655,7 @@ func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) ( func Fadvise(fd int, offset int64, length int64, advice int) (err error) { _, _, e1 := Syscall6(SYS_POSIX_FADVISE, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0) if e1 != 0 { - err = e1 + err = errnoErr(e1) } return } diff --git a/unix/zsyscall_freebsd_arm.go b/unix/zsyscall_freebsd_arm.go index 1fb4603f..0b7a34eb 100644 --- a/unix/zsyscall_freebsd_arm.go +++ b/unix/zsyscall_freebsd_arm.go @@ -655,7 +655,7 @@ func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) ( func Fadvise(fd int, offset int64, length int64, advice int) (err error) { _, _, e1 := Syscall9(SYS_POSIX_FADVISE, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice), 0, 0) if e1 != 0 { - err = e1 + err = errnoErr(e1) } return } diff --git a/unix/zsyscall_linux_386.go b/unix/zsyscall_linux_386.go index fcfbfa2f..eed42a55 100644 --- a/unix/zsyscall_linux_386.go +++ b/unix/zsyscall_linux_386.go @@ -414,7 +414,7 @@ func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) { func Fadvise(fd int, offset int64, length int64, advice int) (err error) { _, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice)) if e1 != 0 { - err = e1 + err = errnoErr(e1) } return } @@ -1422,7 +1422,7 @@ func Chown(path string, uid int, gid int) (err error) { func Fadvise(fd int, offset int64, length int64, advice int) (err error) { _, _, e1 := Syscall6(SYS_FADVISE64_64, uintptr(fd), uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice)) if e1 != 0 { - err = e1 + err = errnoErr(e1) } return } diff --git a/unix/zsyscall_linux_amd64.go b/unix/zsyscall_linux_amd64.go index babe4718..36410b65 100644 --- a/unix/zsyscall_linux_amd64.go +++ b/unix/zsyscall_linux_amd64.go @@ -414,7 +414,7 @@ func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) { func Fadvise(fd int, offset int64, length int64, advice int) (err error) { _, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0) if e1 != 0 { - err = e1 + err = errnoErr(e1) } return } diff --git a/unix/zsyscall_linux_arm.go b/unix/zsyscall_linux_arm.go index 2cdcf6f3..475fb992 100644 --- a/unix/zsyscall_linux_arm.go +++ b/unix/zsyscall_linux_arm.go @@ -414,7 +414,7 @@ func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) { func Fadvise(fd int, offset int64, length int64, advice int) (err error) { _, _, e1 := Syscall9(SYS_FADVISE64, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice), 0, 0) if e1 != 0 { - err = e1 + err = errnoErr(e1) } return }