From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 17 May 2021 10:42:50 +0000 (+0200)
Subject: conf: rename struct mount_opt flag member s/flag/legacy_flag/
X-Git-Tag: lxc-5.0.0~167^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e4bce2c14b962b9dd28fd4fe365a02f75ac748b;p=thirdparty%2Flxc.git

conf: rename struct mount_opt flag member s/flag/legacy_flag/

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

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index c07c2f983..1fc0b6846 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -126,7 +126,7 @@ char *lxchook_names[NUM_LXC_HOOKS] = {
 struct mount_opt {
 	char *name;
 	int clear;
-	int flag;
+	int legacy_flag;
 };
 
 struct caps_opt {
@@ -1979,9 +1979,9 @@ static int parse_mntopt(char *opt, unsigned long *flags, char **data, size_t siz
 
 			if (opt_len == mo_name_len && strnequal(opt, mo->name, mo_name_len)) {
 				if (mo->clear)
-					*flags &= ~mo->flag;
+					*flags &= ~mo->legacy_flag;
 				else
-					*flags |= mo->flag;
+					*flags |= mo->legacy_flag;
 				return 0;
 			}
 		}
@@ -2041,9 +2041,9 @@ static void parse_propagationopt(char *opt, unsigned long *flags)
 			continue;
 
 		if (mo->clear)
-			*flags &= ~mo->flag;
+			*flags &= ~mo->legacy_flag;
 		else
-			*flags |= mo->flag;
+			*flags |= mo->legacy_flag;
 
 		return;
 	}