Skip to content
New issue

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

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

Already on GitHub? # to your account

*: fix compilation with btrfs-progs >= 4.5 #1

Merged
merged 1 commit into from
Dec 16, 2016

Conversation

runcom
Copy link
Contributor

@runcom runcom commented Dec 16, 2016

On btrfs-progs > 4.5, the name field of btrfs_ioctl_vol_args_v2 is encapsulated in a union and cannot be accessed directly by golang (1.7.4 at least).

This patch introduces an helper to get that name field out of the union. This is fixing containerd build (on Fedora 25 at least)

Signed-off-by: Antonio Murdaca runcom@redhat.com

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
@stevvooe
Copy link
Member

LGTM

@stevvooe stevvooe merged commit a548767 into containerd:master Dec 16, 2016
@runcom runcom deleted the fix-btrfs-progs-include branch December 16, 2016 17:36
@estesp
Copy link
Member

estesp commented Dec 16, 2016

heh..already time to update my vendor config and it's not even merged yet 😸

AkihiroSuda added a commit to AkihiroSuda/go-btrfs that referenced this pull request Jul 1, 2021
Fix containerd#1

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit dennwc/btrfs@ee67271)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
AkihiroSuda added a commit to AkihiroSuda/go-btrfs that referenced this pull request Jul 1, 2021
Fix containerd#1

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit dennwc/btrfs@ee67271)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
AkihiroSuda added a commit to AkihiroSuda/go-btrfs that referenced this pull request Jul 1, 2021
Fix containerd#1

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit dennwc/btrfs@ee67271)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
AkihiroSuda added a commit to AkihiroSuda/go-btrfs that referenced this pull request Jul 1, 2021
Fix containerd#1

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit dennwc/btrfs@ee67271)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants