summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2019-09-03 16:58:01 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2019-09-03 16:58:01 -0400
commit41831882e6bf71ef11eba121d03a6835f59254b6 (patch)
tree4f063b38fac6d60b6f54f413e7c43da7e63700b9
parent006bf137413ca5059b9e5b19ad25a1ff32641aaa (diff)
downloadyocto-kernel-cache-41831882e6bf71ef11eba121d03a6835f59254b6.tar.gz
yocto-kernel-cache-41831882e6bf71ef11eba121d03a6835f59254b6.tar.bz2
yocto-kernel-cache-41831882e6bf71ef11eba121d03a6835f59254b6.zip
aufs: bugfix, opts: Fix missing break statement
1/2 [ Author: He Zhe Email: zhe.he@windriver.com Subject: aufs: bugfix, opts: Fix missing break statement Date: Tue, 3 Sep 2019 15:28:03 +0800 commit 4a80018d718f6be2e862d0c70bb11cd6e6d1fae5 upstream Add missing break statement for case Opt_wsum in au_opt_simple. Signed-off-by: He Zhe <zhe.he@windriver.com> See-also: https://www.mail-archive.com/aufs-users@lists.sourceforge.net/msg05684.html (cherry picked from commit 9e7d29356ab57fa5db7e92e51267176e50c1497c) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] 2/2 [ Author: He Zhe Email: zhe.he@windriver.com Subject: aufs: opts: Fix missing fallthrough Date: Tue, 3 Sep 2019 15:28:04 +0800 commit 8d7b6374d5af2c31ce9501d3502808e3c7a9ea68 upstream A compilation -Wimplicit-fallthrough warning was enabled by commit a035d552a93b ("Makefile: Globally enable fall-through warning") and triggers the following warning. fs/aufs/opts.h:78:11: warning: this statement may fall through [-Wimplicit-fallthrough=] This patch adds comments according GNU manual. https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#Warning-Options Signed-off-by: He Zhe <zhe.he@windriver.com> See-also: https://www.mail-archive.com/aufs-users@lists.sourceforge.net/msg05685.html (cherry picked from commit e7619996b014c5d8fd2f6ad89542c545a207667f) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--features/aufs/aufs-bugfix-opts-Fix-missing-break-statement.patch32
-rw-r--r--features/aufs/aufs-opts-Fix-missing-fallthrough.patch43
-rw-r--r--features/aufs/aufs.scc2
3 files changed, 77 insertions, 0 deletions
diff --git a/features/aufs/aufs-bugfix-opts-Fix-missing-break-statement.patch b/features/aufs/aufs-bugfix-opts-Fix-missing-break-statement.patch
new file mode 100644
index 00000000..7313d14d
--- /dev/null
+++ b/features/aufs/aufs-bugfix-opts-Fix-missing-break-statement.patch
@@ -0,0 +1,32 @@
+From 36d415080900e558b30c312c93c5ffcaab996682 Mon Sep 17 00:00:00 2001
+From: He Zhe <zhe.he@windriver.com>
+Date: Tue, 3 Sep 2019 15:28:03 +0800
+Subject: [PATCH 1/2] aufs: bugfix, opts: Fix missing break statement
+
+commit 4a80018d718f6be2e862d0c70bb11cd6e6d1fae5 upstream
+
+Add missing break statement for case Opt_wsum in au_opt_simple.
+
+Signed-off-by: He Zhe <zhe.he@windriver.com>
+See-also: https://www.mail-archive.com/aufs-users@lists.sourceforge.net/msg05684.html
+(cherry picked from commit 9e7d29356ab57fa5db7e92e51267176e50c1497c)
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ fs/aufs/opts.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/fs/aufs/opts.c b/fs/aufs/opts.c
+index c92ca14574ff..a825549c029a 100644
+--- a/fs/aufs/opts.c
++++ b/fs/aufs/opts.c
+@@ -1386,6 +1386,7 @@ static int au_opt_simple(struct super_block *sb, struct au_opt *opt,
+ case Opt_wsum:
+ au_opt_clr(sbinfo->si_mntflags, SUM);
+ au_opt_set(sbinfo->si_mntflags, SUM_W);
++ break;
+ case Opt_nosum:
+ au_opt_clr(sbinfo->si_mntflags, SUM);
+ au_opt_clr(sbinfo->si_mntflags, SUM_W);
+--
+2.19.1
+
diff --git a/features/aufs/aufs-opts-Fix-missing-fallthrough.patch b/features/aufs/aufs-opts-Fix-missing-fallthrough.patch
new file mode 100644
index 00000000..31ddf1f9
--- /dev/null
+++ b/features/aufs/aufs-opts-Fix-missing-fallthrough.patch
@@ -0,0 +1,43 @@
+From eb303f5dab8100336ca7619d99591b5ed98d01cb Mon Sep 17 00:00:00 2001
+From: He Zhe <zhe.he@windriver.com>
+Date: Tue, 3 Sep 2019 15:28:04 +0800
+Subject: [PATCH 2/2] aufs: opts: Fix missing fallthrough
+
+commit 8d7b6374d5af2c31ce9501d3502808e3c7a9ea68 upstream
+
+A compilation -Wimplicit-fallthrough warning was enabled by commit
+a035d552a93b ("Makefile: Globally enable fall-through warning")
+and triggers the following warning.
+
+fs/aufs/opts.h:78:11:
+warning: this statement may fall through [-Wimplicit-fallthrough=]
+
+This patch adds comments according GNU manual.
+https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#Warning-Options
+
+Signed-off-by: He Zhe <zhe.he@windriver.com>
+See-also: https://www.mail-archive.com/aufs-users@lists.sourceforge.net/msg05685.html
+(cherry picked from commit e7619996b014c5d8fd2f6ad89542c545a207667f)
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ fs/aufs/opts.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/fs/aufs/opts.c b/fs/aufs/opts.c
+index a825549c029a..77e17d7b3bdf 100644
+--- a/fs/aufs/opts.c
++++ b/fs/aufs/opts.c
+@@ -1512,8 +1512,10 @@ static int au_opt_br(struct super_block *sb, struct au_opt *opt,
+ if (opt->add.bindex < 0)
+ opt->add.bindex = 0;
+ goto add;
++ /* Always goto add, not fallthrough */
+ case Opt_prepend:
+ opt->add.bindex = 0;
++ /* fallthrough */
+ add: /* indented label */
+ case Opt_add:
+ err = au_br_add(sb, &opt->add,
+--
+2.19.1
+
diff --git a/features/aufs/aufs.scc b/features/aufs/aufs.scc
index 762e7cdc..b5a17b66 100644
--- a/features/aufs/aufs.scc
+++ b/features/aufs/aufs.scc
@@ -4,3 +4,5 @@ patch aufs5-mmap-support.patch
patch aufs5-standalone-support.patch
patch aufs5-core-support.patch
patch aufs5-fix-build-on-v5.3.patch
+patch aufs-bugfix-opts-Fix-missing-break-statement.patch
+patch aufs-opts-Fix-missing-fallthrough.patch