Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.2 backport] pkg/fileutil: fix constant for linux locking #12553

Merged
merged 1 commit into from
Jan 16, 2021

Conversation

kolyshkin
Copy link
Contributor

This is a backport of #12440 to release-3.3 branch, fixing the critical bug in pkg/fileutil. All credits to @moritzboth and @joakim-tjernlund. Original description follows.


The constant F_OFD_GETLK is 36, not 37, according to
/usr/include/bits/fcntl-linux.h
Credits go to @joakim-tjernlund who digged deep enough
to find this.

The constant F_OFD_GETLK is 36, not 37, according to
/usr/include/bits/fcntl-linux.h
Credits go to joakim-tjernlund who digged deep enough
to find this.

Fixes #31182
@ptabor
Copy link
Contributor

ptabor commented Jan 15, 2021

In 3.4 and master (e.g. bea35fd) the constant was replaced with usage of constant from:
"golang.org/x/sys/unix".
Can we do this analogously, or this branch uses too old golang version ?

@ptabor ptabor merged commit 13465d6 into etcd-io:release-3.2 Jan 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants