Skip to content

Commit

Permalink
syscall: remove Flock for aix/ppc64
Browse files Browse the repository at this point in the history
    
    CL 152397 removed it from gc's syscall package.
    
    Updates golang/go#29084
    
    Reviewed-on: https://go-review.googlesource.com/c/152557


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266812 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
ian committed Dec 5, 2018
1 parent 7871216 commit 9315359
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 23 deletions.
2 changes: 1 addition & 1 deletion gcc/go/gofrontend/MERGE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
7259d9a403db2784c7d03239c6a50e730062fc61
d3a98b7a9ea8032be22ebb3ea2f389ce22669d53

The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
22 changes: 0 additions & 22 deletions libgo/go/syscall/libcall_aix.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 9315359

Please sign in to comment.