[lxc-devel] [lxc/master] conf: pedantry

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 364 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170502/288cb421/attachment.bin>
-------------- next part --------------
From 470b359b9d0092b861c03436ee82ff04ef656882 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Tue, 2 May 2017 23:37:16 +0200
Subject: [PATCH 1/2] conf: order mount options

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 src/lxc/conf.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index eb92b5c..ee1d395 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -294,31 +294,31 @@ static  instantiate_cb netdev_deconf[LXC_NET_MAXCONFTYPE + 1] = {
 };
 
 static struct mount_opt mount_opt[] = {
+	{ "async",         1, MS_SYNCHRONOUS },
+	{ "atime",         1, MS_NOATIME     },
+	{ "bind",          0, MS_BIND        },
 	{ "defaults",      0, 0              },
-	{ "ro",            0, MS_RDONLY      },
-	{ "rw",            1, MS_RDONLY      },
-	{ "suid",          1, MS_NOSUID      },
-	{ "nosuid",        0, MS_NOSUID      },
 	{ "dev",           1, MS_NODEV       },
-	{ "nodev",         0, MS_NODEV       },
-	{ "exec",          1, MS_NOEXEC      },
-	{ "noexec",        0, MS_NOEXEC      },
-	{ "sync",          0, MS_SYNCHRONOUS },
-	{ "async",         1, MS_SYNCHRONOUS },
+	{ "diratime",      1, MS_NODIRATIME  },
 	{ "dirsync",       0, MS_DIRSYNC     },
-	{ "remount",       0, MS_REMOUNT     },
+	{ "exec",          1, MS_NOEXEC      },
 	{ "mand",          0, MS_MANDLOCK    },
-	{ "nomand",        1, MS_MANDLOCK    },
-	{ "atime",         1, MS_NOATIME     },
 	{ "noatime",       0, MS_NOATIME     },
-	{ "diratime",      1, MS_NODIRATIME  },
+	{ "nodev",         0, MS_NODEV       },
 	{ "nodiratime",    0, MS_NODIRATIME  },
-	{ "bind",          0, MS_BIND        },
+	{ "noexec",        0, MS_NOEXEC      },
+	{ "nomand",        1, MS_MANDLOCK    },
+	{ "norelatime",    1, MS_RELATIME    },
+	{ "nostrictatime", 1, MS_STRICTATIME },
+	{ "nosuid",        0, MS_NOSUID      },
 	{ "rbind",         0, MS_BIND|MS_REC },
 	{ "relatime",      0, MS_RELATIME    },
-	{ "norelatime",    1, MS_RELATIME    },
+	{ "remount",       0, MS_REMOUNT     },
+	{ "ro",            0, MS_RDONLY      },
+	{ "rw",            1, MS_RDONLY      },
 	{ "strictatime",   0, MS_STRICTATIME },
-	{ "nostrictatime", 1, MS_STRICTATIME },
+	{ "suid",          1, MS_NOSUID      },
+	{ "sync",          0, MS_SYNCHRONOUS },
 	{ NULL,            0, 0              },
 };
 

From 04c7e65d86c6fc2256d88d8df457875dec8287f9 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Tue, 2 May 2017 23:38:14 +0200
Subject: [PATCH 2/2] conf: add MS_LAZYTIME to mount options

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 src/lxc/conf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index ee1d395..1a5381c 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -302,6 +302,7 @@ static struct mount_opt mount_opt[] = {
 	{ "diratime",      1, MS_NODIRATIME  },
 	{ "dirsync",       0, MS_DIRSYNC     },
 	{ "exec",          1, MS_NOEXEC      },
+	{ "lazytime",	   0, MS_LAZYTIME    },
 	{ "mand",          0, MS_MANDLOCK    },
 	{ "noatime",       0, MS_NOATIME     },
 	{ "nodev",         0, MS_NODEV       },