Add relatime and strictatime mount options

Also add #ifndef for compability with glibc before 2.12.

Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Sven Wegener 2011-05-23 23:12:24 +02:00 committed by Daniel Lezcano
parent 820339bd96
commit 88d413d5b6

View File

@ -80,6 +80,14 @@ lxc_log_define(lxc_conf, lxc);
#define MNT_DETACH 2 #define MNT_DETACH 2
#endif #endif
#ifndef MS_RELATIME
#define MS_RELATIME (1 << 21)
#endif
#ifndef MS_STRICTATIME
#define MS_STRICTATIME (1 << 24)
#endif
#ifndef CAP_SETFCAP #ifndef CAP_SETFCAP
#define CAP_SETFCAP 31 #define CAP_SETFCAP 31
#endif #endif
@ -126,28 +134,32 @@ static instanciate_cb netdev_conf[LXC_NET_MAXCONFTYPE + 1] = {
}; };
static struct mount_opt mount_opt[] = { static struct mount_opt mount_opt[] = {
{ "defaults", 0, 0 }, { "defaults", 0, 0 },
{ "ro", 0, MS_RDONLY }, { "ro", 0, MS_RDONLY },
{ "rw", 1, MS_RDONLY }, { "rw", 1, MS_RDONLY },
{ "suid", 1, MS_NOSUID }, { "suid", 1, MS_NOSUID },
{ "nosuid", 0, MS_NOSUID }, { "nosuid", 0, MS_NOSUID },
{ "dev", 1, MS_NODEV }, { "dev", 1, MS_NODEV },
{ "nodev", 0, MS_NODEV }, { "nodev", 0, MS_NODEV },
{ "exec", 1, MS_NOEXEC }, { "exec", 1, MS_NOEXEC },
{ "noexec", 0, MS_NOEXEC }, { "noexec", 0, MS_NOEXEC },
{ "sync", 0, MS_SYNCHRONOUS }, { "sync", 0, MS_SYNCHRONOUS },
{ "async", 1, MS_SYNCHRONOUS }, { "async", 1, MS_SYNCHRONOUS },
{ "dirsync", 0, MS_DIRSYNC }, { "dirsync", 0, MS_DIRSYNC },
{ "remount", 0, MS_REMOUNT }, { "remount", 0, MS_REMOUNT },
{ "mand", 0, MS_MANDLOCK }, { "mand", 0, MS_MANDLOCK },
{ "nomand", 1, MS_MANDLOCK }, { "nomand", 1, MS_MANDLOCK },
{ "atime", 1, MS_NOATIME }, { "atime", 1, MS_NOATIME },
{ "noatime", 0, MS_NOATIME }, { "noatime", 0, MS_NOATIME },
{ "diratime", 1, MS_NODIRATIME }, { "diratime", 1, MS_NODIRATIME },
{ "nodiratime", 0, MS_NODIRATIME }, { "nodiratime", 0, MS_NODIRATIME },
{ "bind", 0, MS_BIND }, { "bind", 0, MS_BIND },
{ "rbind", 0, MS_BIND|MS_REC }, { "rbind", 0, MS_BIND|MS_REC },
{ NULL, 0, 0 }, { "relatime", 0, MS_RELATIME },
{ "norelatime", 1, MS_RELATIME },
{ "strictatime", 0, MS_STRICTATIME },
{ "nostrictatime", 1, MS_STRICTATIME },
{ NULL, 0, 0 },
}; };
static struct caps_opt caps_opt[] = { static struct caps_opt caps_opt[] = {