From 185a15cfb253f5a20f9ca14571df423b5460a10d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 17 Jun 2020 11:59:19 +0100 Subject: [PATCH] lxc: drop compat code for mount constants MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Given our supported platform matrix, we can safely assume that all the mount constants we need are defined by the system headers. Reviewed-by: Pavel Hrdina Signed-off-by: Daniel P. Berrangé --- src/lxc/lxc_container.c | 17 ----------------- src/lxc/lxc_controller.c | 8 -------- 2 files changed, 25 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 77df49ea75..b0a6deeb56 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -527,23 +527,6 @@ lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, /*_syscall2(int, pivot_root, char *, newroot, const char *, oldroot)*/ extern int pivot_root(const char * new_root, const char * put_old); -#ifndef MS_REC -# define MS_REC 16384 -#endif - -#ifndef MNT_DETACH -# define MNT_DETACH 0x00000002 -#endif - -#ifndef MS_PRIVATE -# define MS_PRIVATE (1<<18) -#endif - -#ifndef MS_SLAVE -# define MS_SLAVE (1<<19) -#endif - - static int lxcContainerUnmountSubtree(const char *prefix, bool isOldRootFS) { diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 734ac73210..2e865e0e7c 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2053,14 +2053,6 @@ static int lxcSetPersonality(virDomainDefPtr def) return 0; } -#ifndef MS_REC -# define MS_REC 16384 -#endif - -#ifndef MS_SLAVE -# define MS_SLAVE (1<<19) -#endif - /* Create a private tty using the private devpts at PTMX, returning * the master in *TTYMASTER and the name of the slave, _from the * perspective of the guest after remounting file systems_, in -- 2.39.5