]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
conf: rename struct mount_opt flag member s/flag/legacy_flag/
authorChristian Brauner <christian.brauner@ubuntu.com>
Mon, 17 May 2021 10:42:50 +0000 (12:42 +0200)
committerChristian Brauner <christian.brauner@ubuntu.com>
Mon, 17 May 2021 10:44:20 +0000 (12:44 +0200)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/conf.c

index c07c2f98351641ecf3fbe66bad39c8bc72f03b62..1fc0b684697d0ef038a67adecebd3516647030ed 100644 (file)
@@ -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;
        }