Skip to content

pkg/fileutil: fix constant for linux locking#12440

Closed
moritzboth wants to merge 1 commit intoetcd-io:masterfrom
moritzboth:31182
Closed

pkg/fileutil: fix constant for linux locking#12440
moritzboth wants to merge 1 commit intoetcd-io:masterfrom
moritzboth:31182

Conversation

@moritzboth
Copy link
Copy Markdown

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

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
// constants from /usr/include/bits/fcntl-linux.h
const (
F_OFD_GETLK = 37
F_OFD_GETLK = 36
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps it'll be better to reuse golang.org/x/sys/unix instead, which have stuff like this available.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agree with you.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very well. I'm out for lack of qualification, sorry

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest you pull this one to get rid of the problem, then add your cleanup on top.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree. This can be merged as-is.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively, I have created #12444 which I will rebase if this one will be merged earlier.

Copy link
Copy Markdown
Contributor

@ptabor ptabor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified with:
https://code.woboq.org/gcc/include/bits/fcntl-linux.h.html#_M/F_OFD_GETLK

I would recommend adding a test that confirms proper behavior of the lock library.

Copy link
Copy Markdown
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (not a maintainer)

@joakim-tjernlund
Copy link
Copy Markdown

This problem is still not fixed in version 19 branch which I guess most people use in production

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.

5 participants