proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 06:21:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

macro: move MS_* macros

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-09-02 07:32:23 +02:00
parent 04a49be674
commit 6e5655e0db
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lxc/conf.c
View File

@ -101,6 +101,7 @@
#include "lsm/lsm.h" #include "lsm/lsm.h"
#include "lxclock.h" #include "lxclock.h"
#include "lxcseccomp.h" #include "lxcseccomp.h"
#include "macro.h"
#include "namespace.h" #include "namespace.h"
#include "network.h" #include "network.h"
#include "parse.h" #include "parse.h"
@ -111,14 +112,6 @@
#include "terminal.h" #include "terminal.h"
#include "utils.h" #include "utils.h"
#ifndef MS_PRIVATE
#define MS_PRIVATE (1<<18)
#endif
#ifndef MS_LAZYTIME
#define MS_LAZYTIME (1<<25)
#endif
lxc_log_define(conf, lxc); lxc_log_define(conf, lxc);
/* The lxc_conf of the container currently being worked on in an API call. /* The lxc_conf of the container currently being worked on in an API call.

12
src/lxc/macro.h
View File

@ -303,14 +303,22 @@ extern int __build_bug_on_failed;
#define LXC_AUDS_ADDR_LEN sizeof(((struct sockaddr_un *)0)->sun_path) #define LXC_AUDS_ADDR_LEN sizeof(((struct sockaddr_un *)0)->sun_path)
/* mount */ /* mount */
#ifndef MS_REC #ifndef MS_PRIVATE
#define MS_REC 16384 #define MS_PRIVATE (1<<18)
#endif #endif
#ifndef MS_SLAVE #ifndef MS_SLAVE
#define MS_SLAVE (1 << 19) #define MS_SLAVE (1 << 19)
#endif #endif
#ifndef MS_LAZYTIME
#define MS_LAZYTIME (1<<25)
#endif
#ifndef MS_REC
#define MS_REC 16384
#endif
/* open */ /* open */
#ifndef O_PATH #ifndef O_PATH
#define O_PATH 010000000 #define O_PATH 010000000