]> xenbits.xensource.com Git - libvirt.git/commitdiff
lxc: containter: fix build with glibc 2.36
authorCole Robinson <crobinso@redhat.com>
Mon, 1 Aug 2022 19:20:38 +0000 (15:20 -0400)
committerCole Robinson <crobinso@redhat.com>
Tue, 2 Aug 2022 18:53:53 +0000 (14:53 -0400)
With glibc 2.36, sys/mount.h and linux/mount.h conflict:
https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E

lxc_container.c imports sys/mount.h and linux/fs.h, which pulls in
linux/mount.h.

linux/fs.h isn't required here though. glibc sys/mount.h has had
MS_MOVE since 2.12 in 2010

Reviewed-by: Erik Skultety <eskultet@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
src/lxc/lxc_container.c

index b5278831da78735d41180f1e1aa442880b5ec735..a5401c2186ec97eb50db8685e8695409ae47cb61 100644 (file)
@@ -33,9 +33,6 @@
 /* Yes, we want linux private one, for _syscall2() macro */
 #include <linux/unistd.h>
 
-/* For MS_MOVE */
-#include <linux/fs.h>
-
 #if WITH_CAPNG
 # include <cap-ng.h>
 #endif