Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Aufs5 Standalone
Commits
8c8d40f7
Commit
8c8d40f7
authored
Dec 21, 2020
by
J. R. Okajima
Browse files
Merge branch 'aufs5.6/30stdalone' into aufs5.6/39public
parents
2ab5ec25
dde038c8
Changes
3
Show whitespace changes
Inline
Side-by-side
fs/aufs/cpup.c
View file @
8c8d40f7
...
@@ -709,7 +709,7 @@ int cpup_entry(struct au_cp_generic *cpg, struct dentry *dst_parent,
...
@@ -709,7 +709,7 @@ int cpup_entry(struct au_cp_generic *cpg, struct dentry *dst_parent,
case
S_IFCHR
:
case
S_IFCHR
:
case
S_IFBLK
:
case
S_IFBLK
:
AuDebugOn
(
!
capable
(
CAP_MKNOD
));
AuDebugOn
(
!
capable
(
CAP_MKNOD
));
/*FALLTHROUGH*/
fallthrough
;
case
S_IFIFO
:
case
S_IFIFO
:
case
S_IFSOCK
:
case
S_IFSOCK
:
err
=
vfsub_mknod
(
h_dir
,
&
h_path
,
mode
,
h_inode
->
i_rdev
);
err
=
vfsub_mknod
(
h_dir
,
&
h_path
,
mode
,
h_inode
->
i_rdev
);
...
...
fs/aufs/hnotify.c
View file @
8c8d40f7
...
@@ -584,7 +584,7 @@ int au_hnotify(struct inode *h_dir, struct au_hnotify *hnotify, u32 mask,
...
@@ -584,7 +584,7 @@ int au_hnotify(struct inode *h_dir, struct au_hnotify *hnotify, u32 mask,
case
FS_MOVED_TO
:
case
FS_MOVED_TO
:
au_fset_hnjob
(
flags
[
AuHn_CHILD
],
XINO0
);
au_fset_hnjob
(
flags
[
AuHn_CHILD
],
XINO0
);
au_fset_hnjob
(
flags
[
AuHn_CHILD
],
MNTPNT
);
au_fset_hnjob
(
flags
[
AuHn_CHILD
],
MNTPNT
);
/*FALLTHROUGH*/
fallthrough
;
case
FS_CREATE
:
case
FS_CREATE
:
AuDebugOn
(
!
h_child_name
);
AuDebugOn
(
!
h_child_name
);
break
;
break
;
...
...
fs/aufs/opts.c
View file @
8c8d40f7
...
@@ -507,7 +507,7 @@ au_wbr_create_val(char *str, struct au_opt_wbr_create *create)
...
@@ -507,7 +507,7 @@ au_wbr_create_val(char *str, struct au_opt_wbr_create *create)
err
=
e
;
err
=
e
;
break
;
break
;
}
}
/*FALLTHROUGH*/
fallthrough
;
case
AuWbrCreate_MFS
:
case
AuWbrCreate_MFS
:
case
AuWbrCreate_PMFS
:
case
AuWbrCreate_PMFS
:
create
->
mfs_second
=
AUFS_MFS_DEF_SEC
;
create
->
mfs_second
=
AUFS_MFS_DEF_SEC
;
...
@@ -1239,7 +1239,7 @@ int au_opts_parse(struct super_block *sb, char *str, struct au_opts *opts)
...
@@ -1239,7 +1239,7 @@ int au_opts_parse(struct super_block *sb, char *str, struct au_opts *opts)
case
Opt_ignore
:
case
Opt_ignore
:
pr_warn
(
"ignored %s
\n
"
,
opt_str
);
pr_warn
(
"ignored %s
\n
"
,
opt_str
);
/*FALLTHROUGH*/
fallthrough
;
case
Opt_ignore_silent
:
case
Opt_ignore_silent
:
skipped
=
1
;
skipped
=
1
;
err
=
0
;
err
=
0
;
...
@@ -1295,7 +1295,7 @@ static int au_opt_wbr_create(struct super_block *sb,
...
@@ -1295,7 +1295,7 @@ static int au_opt_wbr_create(struct super_block *sb,
case
AuWbrCreate_PMFSRR
:
case
AuWbrCreate_PMFSRR
:
case
AuWbrCreate_PMFSRRV
:
case
AuWbrCreate_PMFSRRV
:
sbinfo
->
si_wbr_mfs
.
mfsrr_watermark
=
create
->
mfsrr_watermark
;
sbinfo
->
si_wbr_mfs
.
mfsrr_watermark
=
create
->
mfsrr_watermark
;
/*FALLTHROUGH*/
fallthrough
;
case
AuWbrCreate_MFS
:
case
AuWbrCreate_MFS
:
case
AuWbrCreate_MFSV
:
case
AuWbrCreate_MFSV
:
case
AuWbrCreate_PMFS
:
case
AuWbrCreate_PMFS
:
...
@@ -1515,7 +1515,7 @@ static int au_opt_br(struct super_block *sb, struct au_opt *opt,
...
@@ -1515,7 +1515,7 @@ static int au_opt_br(struct super_block *sb, struct au_opt *opt,
/* Always goto add, not fallthrough */
/* Always goto add, not fallthrough */
case
Opt_prepend
:
case
Opt_prepend
:
opt
->
add
.
bindex
=
0
;
opt
->
add
.
bindex
=
0
;
/*
fallthrough
*/
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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment