Skip to content

L
lxc
Unverified Commit 1e4bce2c by Christian Brauner
Options

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

Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent d94eb390
Showing with 5 additions and 5 deletions
src/lxc/conf.c
...@@ -126,7 +126,7 @@ char *lxchook_names[NUM_LXC_HOOKS] = { ...@@ -126,7 +126,7 @@ char *lxchook_names[NUM_LXC_HOOKS] = {
struct mount_opt { struct mount_opt {
char *name; char *name;
int clear; int clear;
int flag; int legacy_flag;
}; };
struct caps_opt { struct caps_opt {
...@@ -1979,9 +1979,9 @@ static int parse_mntopt(char *opt, unsigned long *flags, char **data, size_t siz ...@@ -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 (opt_len == mo_name_len && strnequal(opt, mo->name, mo_name_len)) {
if (mo->clear) if (mo->clear)
*flags &= ~mo->flag; *flags &= ~mo->legacy_flag;
else else
*flags |= mo->flag; *flags |= mo->legacy_flag;
return 0; return 0;
} }
} }
...@@ -2041,9 +2041,9 @@ static void parse_propagationopt(char *opt, unsigned long *flags) ...@@ -2041,9 +2041,9 @@ static void parse_propagationopt(char *opt, unsigned long *flags)
continue; continue;
if (mo->clear) if (mo->clear)
*flags &= ~mo->flag; *flags &= ~mo->legacy_flag;
else else
*flags |= mo->flag; *flags |= mo->legacy_flag;
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment