Skip to content

GitLab

Commit fd214ba2 authored by J. R. Okajima's avatar J. R. Okajima
Browse files

Merge branch 'aufs5.2/30stdalone' into aufs5.x-rcN/30stdalone

parents 7b91669a 9737a4cb
Hide whitespace changes
Inline Side-by-side
fs/aufs/opts.c
View file @ fd214ba2
...@@ -1386,6 +1386,7 @@ static int au_opt_simple(struct super_block *sb, struct au_opt *opt, ...@@ -1386,6 +1386,7 @@ static int au_opt_simple(struct super_block *sb, struct au_opt *opt,
case Opt_wsum: case Opt_wsum:
au_opt_clr(sbinfo->si_mntflags, SUM); au_opt_clr(sbinfo->si_mntflags, SUM);
au_opt_set(sbinfo->si_mntflags, SUM_W); au_opt_set(sbinfo->si_mntflags, SUM_W);
break;
case Opt_nosum: case Opt_nosum:
au_opt_clr(sbinfo->si_mntflags, SUM); au_opt_clr(sbinfo->si_mntflags, SUM);
au_opt_clr(sbinfo->si_mntflags, SUM_W); au_opt_clr(sbinfo->si_mntflags, SUM_W);
...@@ -1511,8 +1512,10 @@ static int au_opt_br(struct super_block *sb, struct au_opt *opt, ...@@ -1511,8 +1512,10 @@ static int au_opt_br(struct super_block *sb, struct au_opt *opt,
if (opt->add.bindex < 0) if (opt->add.bindex < 0)
opt->add.bindex = 0; opt->add.bindex = 0;
goto add; goto add;
/* Always goto add, not fallthrough */
case Opt_prepend: case Opt_prepend:
opt->add.bindex = 0; opt->add.bindex = 0;
/* fallthrough */
add: /* indented label */ add: /* indented label */
case Opt_add: case Opt_add:
err = au_br_add(sb, &opt->add, err = au_br_add(sb, &opt->add,
......
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