From ca9f2088aab4fc9832e587655f0026875bddbf9b Mon Sep 17 00:00:00 2001 From: Ben Aldrich Date: Wed, 16 Nov 2016 02:08:01 +0000 Subject: [PATCH] replace unix implementation to be the same as solaris to fix an issue with glusterfs --- bolt_unix.go | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/bolt_unix.go b/bolt_unix.go index cad62dd..50cbbc0 100644 --- a/bolt_unix.go +++ b/bolt_unix.go @@ -21,16 +21,21 @@ func flock(db *DB, mode os.FileMode, exclusive bool, timeout time.Duration) erro } else if timeout > 0 && time.Since(t) > timeout { return ErrTimeout } - flag := syscall.LOCK_SH + var lock syscall.Flock_t + lock.Start = 0 + lock.Len = 0 + lock.Pid = 0 + lock.Whence = 0 + lock.Pid = 0 if exclusive { - flag = syscall.LOCK_EX + lock.Type = syscall.F_WRLCK + } else { + lock.Type = syscall.F_RDLCK } - - // Otherwise attempt to obtain an exclusive lock. - err := syscall.Flock(int(db.file.Fd()), flag|syscall.LOCK_NB) + err := syscall.FcntlFlock(db.file.Fd(), syscall.F_SETLK, &lock) if err == nil { return nil - } else if err != syscall.EWOULDBLOCK { + } else if err != syscall.EAGAIN { return err } @@ -41,7 +46,12 @@ func flock(db *DB, mode os.FileMode, exclusive bool, timeout time.Duration) erro // funlock releases an advisory lock on a file descriptor. func funlock(db *DB) error { - return syscall.Flock(int(db.file.Fd()), syscall.LOCK_UN) + var lock syscall.Flock_t + lock.Start = 0 + lock.Len = 0 + lock.Type = syscall.F_UNLCK + lock.Whence = 0 + return syscall.FcntlFlock(uintptr(db.file.Fd()), syscall.F_SETLK, &lock) } // mmap memory maps a DB's data file.