Skip to content

Commit b806a06

Browse files
committed
Merge remote-tracking branch 'aufs5-standalone/aufs5.4/00base' into aufs5.4/10static
2 parents 96fe8e5 + 8eee39d commit b806a06

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

fs/aufs/cpup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ int cpup_entry(struct au_cp_generic *cpg, struct dentry *dst_parent,
696696
case S_IFCHR:
697697
case S_IFBLK:
698698
AuDebugOn(!capable(CAP_MKNOD));
699-
/*FALLTHROUGH*/
699+
fallthrough;
700700
case S_IFIFO:
701701
case S_IFSOCK:
702702
err = vfsub_mknod(h_dir, &h_path, mode, h_inode->i_rdev);

fs/aufs/hnotify.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ int au_hnotify(struct inode *h_dir, struct au_hnotify *hnotify, u32 mask,
571571
case FS_MOVED_TO:
572572
au_fset_hnjob(flags[AuHn_CHILD], XINO0);
573573
au_fset_hnjob(flags[AuHn_CHILD], MNTPNT);
574-
/*FALLTHROUGH*/
574+
fallthrough;
575575
case FS_CREATE:
576576
AuDebugOn(!h_child_name);
577577
break;

fs/aufs/opts.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ au_wbr_create_val(char *str, struct au_opt_wbr_create *create)
494494
err = e;
495495
break;
496496
}
497-
/*FALLTHROUGH*/
497+
fallthrough;
498498
case AuWbrCreate_MFS:
499499
case AuWbrCreate_PMFS:
500500
create->mfs_second = AUFS_MFS_DEF_SEC;
@@ -1226,7 +1226,7 @@ int au_opts_parse(struct super_block *sb, char *str, struct au_opts *opts)
12261226

12271227
case Opt_ignore:
12281228
pr_warn("ignored %s\n", opt_str);
1229-
/*FALLTHROUGH*/
1229+
fallthrough;
12301230
case Opt_ignore_silent:
12311231
skipped = 1;
12321232
err = 0;
@@ -1282,7 +1282,7 @@ static int au_opt_wbr_create(struct super_block *sb,
12821282
case AuWbrCreate_PMFSRR:
12831283
case AuWbrCreate_PMFSRRV:
12841284
sbinfo->si_wbr_mfs.mfsrr_watermark = create->mfsrr_watermark;
1285-
/*FALLTHROUGH*/
1285+
fallthrough;
12861286
case AuWbrCreate_MFS:
12871287
case AuWbrCreate_MFSV:
12881288
case AuWbrCreate_PMFS:
@@ -1502,7 +1502,7 @@ static int au_opt_br(struct super_block *sb, struct au_opt *opt,
15021502
/* Always goto add, not fallthrough */
15031503
case Opt_prepend:
15041504
opt->add.bindex = 0;
1505-
/* fallthrough */
1505+
fallthrough;
15061506
add: /* indented label */
15071507
case Opt_add:
15081508
err = au_br_add(sb, &opt->add,

0 commit comments

Comments
 (0)