From: Abin Shahab <ashahab@altiscale.com>
Date: Wed, 12 Nov 2014 00:06:52 +0000 (+0000)
Subject: Remounts bind mounts if read-only flag is provided
X-Git-Tag: lxc-1.1.0.alpha3~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c5b6e7c3524031c3e9e203a9ab3beea7efa7a41;p=thirdparty%2Flxc.git

Remounts bind mounts if read-only flag is provided

Bind mounts do not honor filesystem mount options. This change will
remount filesystems that are bind mounted if there are changes to
filesystem mount options, specifically if the mount is readonly.

Signed-off-by: Abin Shahab <ashahab@altiscale.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 9400dd3ca..ac21c7713 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1921,10 +1921,12 @@ static int mount_entry(const char *fsname, const char *target,
 	if ((mountflags & MS_REMOUNT) || (mountflags & MS_BIND)) {
 		DEBUG("remounting %s on %s to respect bind or remount options",
 		      fsname ? fsname : "(none)", target ? target : "(none)");
-
+		unsigned long rqd_flags = 0;
+		if (mountflags & MS_RDONLY)
+			rqd_flags |= MS_RDONLY;
 #ifdef HAVE_STATVFS
 		if (statvfs(fsname, &sb) == 0) {
-			unsigned long required_flags = 0;
+			unsigned long required_flags = rqd_flags;
 			if (sb.f_flag & MS_NOSUID)
 				required_flags |= MS_NOSUID;
 			if (sb.f_flag & MS_NODEV)
@@ -1940,7 +1942,7 @@ static int mount_entry(const char *fsname, const char *target,
 			 * mountflags, then skip the remount
 			 */
 			if (!(mountflags & MS_REMOUNT)) {
-				if (!(required_flags & ~mountflags)) {
+				if (!(required_flags & ~mountflags) && rqd_flags == 0) {
 					DEBUG("mountflags already was %lu, skipping remount",
 						mountflags);
 					goto skipremount;