daemon/graphdriver/btrfs: workaround field rename in btrfs-progs 6.1#44707
Merged
neersighted merged 1 commit intomoby:masterfrom Dec 29, 2022
Merged
daemon/graphdriver/btrfs: workaround field rename in btrfs-progs 6.1#44707neersighted merged 1 commit intomoby:masterfrom
neersighted merged 1 commit intomoby:masterfrom
Conversation
Member
|
Hmm interesting error from GitHub; |
corhere
approved these changes
Dec 28, 2022
Contributor
corhere
left a comment
corhere
left a comment
There was a problem hiding this comment.
That hack is beautiful! I'm ashamed I hadn't thought of it myself.
Comment on lines
7
to
12
| // keep struct field name compatible with btrfs-progs < 6.1. | ||
| #define max_referenced max_rfer | ||
|
|
||
| #include <stdlib.h> | ||
| #include <dirent.h> | ||
| #include <btrfs/ioctl.h> |
Contributor
There was a problem hiding this comment.
Suggested change
| // keep struct field name compatible with btrfs-progs < 6.1. | |
| #define max_referenced max_rfer | |
| #include <stdlib.h> | |
| #include <dirent.h> | |
| #include <btrfs/ioctl.h> | |
| #include <stdlib.h> | |
| #include <dirent.h> | |
| // keep struct field name compatible with btrfs-progs < 6.1. | |
| #define max_referenced max_rfer | |
| #include <btrfs/ioctl.h> |
Just to be safe, in case the libc headers contain a max_referenced token.
Closes: moby#44698 Signed-off-by: Shengjing Zhu <[email protected]>
zhsj
force-pushed
the
btrfs-progs-6.1
branch
from
b468219 to
ffbbe3d
Compare
This was referenced Dec 29, 2022
thaJeztah
added
area/storage/btrfs
status/2-code-review
kind/bugfix
neersighted
approved these changes
Dec 29, 2022
flouthoc
added a commit
to flouthoc/storage
that referenced
this pull request
Jan 1, 2023
Field name `args.lim.max_referenced` is renamed to `args.lim.max_rfer` in newer versions. See: https://docs.huihoo.com/doxygen/linux/kernel/3.7/structbtrfs__ioctl__qgroup__limit__args.html PR is similar to: moby/moby#44707 Closes: containers#1454 Signed-off-by: Aditya R <[email protected]>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Closes: #44698
An ugly hack, but hmm...