From d3a98b7a9ea8032be22ebb3ea2f389ce22669d53 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 4 Dec 2018 17:00:14 +0100 Subject: [PATCH] syscall: remove Flock for aix/ppc64 CL 152397 removed it from gc's syscall package. Updates golang/go#29084 Change-Id: Iac26d912851cdf34c208b9b7eb02b522c085c5ef Reviewed-on: https://go-review.googlesource.com/c/152557 Reviewed-by: Ian Lance Taylor --- libgo/go/syscall/libcall_aix.go | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/libgo/go/syscall/libcall_aix.go b/libgo/go/syscall/libcall_aix.go index 5afc65e7a..072f92a81 100644 --- a/libgo/go/syscall/libcall_aix.go +++ b/libgo/go/syscall/libcall_aix.go @@ -111,28 +111,6 @@ func Reboot(how int) (err error) { //sys Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) //fchownat(dirfd _C_int, path *byte, owner Uid_t, group Gid_t, flags _C_int) _C_int -// On AIX, there is no flock() system call, we emulate it. -func Flock(fd int, op int) (err error) { - lk := &Flock_t{} - if (op & LOCK_UN) != 0 { - lk.Type = F_UNLCK - } else if (op & LOCK_EX) != 0 { - lk.Type = F_WRLCK - } else if (op & LOCK_SH) != 0 { - lk.Type = F_RDLCK - } else { - return nil - } - if (op & LOCK_NB) != 0 { - err = FcntlFlock(uintptr(fd), F_SETLK, lk) - if err != nil && (err == EAGAIN || err == EACCES) { - return EWOULDBLOCK - } - return err - } - return FcntlFlock(uintptr(fd), F_SETLKW, lk) -} - //sys Fstatfs(fd int, buf *Statfs_t) (err error) //fstatfs64(fd _C_int, buf *Statfs_t) _C_int