From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 19 Mar 2020 12:27:51 +0000 (+0100)
Subject: conf: flatten logic in mount_entry()
X-Git-Tag: lxc-4.0.0~17^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15f3e22b00e3b25b1cf5ae031681277d46a040cd;p=thirdparty%2Flxc.git

conf: flatten logic in mount_entry()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 5c280c381..066a600d6 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1875,11 +1875,9 @@ static int mount_entry(const char *fsname, const char *target,
 			 * does not have any flags which are not already in
 			 * mountflags, then skip the remount.
 			 */
-			if (!(mountflags & MS_REMOUNT)) {
-				if (!(required_flags & ~mountflags)) {
-					DEBUG("Mountflags already were %lu, skipping remount", mountflags);
-					goto skipremount;
-				}
+			if (!(mountflags & MS_REMOUNT) && !(required_flags & ~mountflags)) {
+				DEBUG("Mountflags already were %lu, skipping remount", mountflags);
+				goto skipremount;
 			}
 
 			mountflags |= required_flags;