[3.3 backport] pkg/fileutil: fix constant for linux locking #12552
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
|
@jingyih ptal 🤗 |
|
In 3.4 and master (e.g. bea35fd) the constant was replaced with usage of constant from: |
I think we can. The reason I did not do that is to minimize the code changes to a branch which is in maintenance mode. |
|
@ptabor are there plans to do a patch release for v3.3.x? I see two fixes were merged in the branch; v3.3.25...release-3.3 |
|
Yes, please do a release so we can close this 3 year old bug. |
|
@gyuho can you please cut a v3.3.26 release as per the comments above? |
Closed
kolyshkin
added a commit
to kolyshkin/moby
that referenced
this pull request
Feb 18, 2021
Bump etcd to v3.3.25 + etcd-io/etcd#12552, to fix moby#31182 This adds 2 new and removes 1 unused package from vendor.conf. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
thaJeztah
pushed a commit
to moby/moby
that referenced
this pull request
Jan 5, 2022
Bump etcd to v3.3.27, which includes etcd-io/etcd#12552, to fix #31182 Full diff: etcd-io/etcd@v3.3.25...v3.3.27 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
evol262
pushed a commit
to evol262/moby
that referenced
this pull request
Jan 12, 2022
Bump etcd to v3.3.27, which includes etcd-io/etcd#12552, to fix moby#31182 Full diff: etcd-io/etcd@v3.3.25...v3.3.27 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
pushed a commit
to thaJeztah/docker
that referenced
this pull request
Feb 18, 2022
Bump etcd to v3.3.27, which includes etcd-io/etcd#12552, to fix moby#31182 Full diff: etcd-io/etcd@v3.3.25...v3.3.27 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ffd5a20) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
lmbarros
pushed a commit
to balena-os/balena-engine
that referenced
this pull request
Nov 22, 2022
Bump etcd to v3.3.27, which includes etcd-io/etcd#12552, to fix moby/moby#31182 Full diff: etcd-io/etcd@v3.3.25...v3.3.27 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ffd5a20) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
lmbarros
pushed a commit
to balena-os/balena-engine
that referenced
this pull request
Nov 22, 2022
Bump etcd to v3.3.27, which includes etcd-io/etcd#12552, to fix moby/moby#31182 Full diff: etcd-io/etcd@v3.3.25...v3.3.27 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ffd5a20) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
lmbarros
pushed a commit
to balena-os/balena-engine
that referenced
this pull request
Dec 8, 2022
Bump etcd to v3.3.27, which includes etcd-io/etcd#12552, to fix moby/moby#31182 Full diff: etcd-io/etcd@v3.3.25...v3.3.27 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ffd5a20) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
lmbarros
pushed a commit
to balena-os/balena-engine
that referenced
this pull request
Dec 21, 2022
Bump etcd to v3.3.27, which includes etcd-io/etcd#12552, to fix moby/moby#31182 Full diff: etcd-io/etcd@v3.3.25...v3.3.27 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ffd5a20) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
lmbarros
pushed a commit
to balena-os/balena-engine
that referenced
this pull request
Feb 7, 2023
Bump etcd to v3.3.27, which includes etcd-io/etcd#12552, to fix moby/moby#31182 Full diff: etcd-io/etcd@v3.3.25...v3.3.27 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ffd5a20) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.