From f6f8832e721f30c30462a2749dcab5926aad5305 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 21 Feb 2019 10:50:49 -0500 Subject: [PATCH] add patch annotate-implicit-fall-throughs --- annotate-implicit-fall-throughs | 43 +++++++++++++++++++++++++++++++++++++++++ series | 1 + timestamps | 7 ++++--- 3 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 annotate-implicit-fall-throughs diff --git a/annotate-implicit-fall-throughs b/annotate-implicit-fall-throughs new file mode 100644 index 00000000..4df57b03 --- /dev/null +++ b/annotate-implicit-fall-throughs @@ -0,0 +1,43 @@ +ext4: annotate implicit fall throughs + +From: Mathieu Malaterre + +There is a plan to build the kernel with -Wimplicit-fallthrough and +these places in the code produced warnings (W=1). Fix them up. + +This commit remove the following warnings: + + fs/ext4/hash.c:233:15: warning: this statement may fall through [-Wimplicit-fallthrough=] + fs/ext4/hash.c:246:15: warning: this statement may fall through [-Wimplicit-fallthrough=] + +Signed-off-by: Mathieu Malaterre +Signed-off-by: Theodore Ts'o +Reviewed-by: Andreas Dilger +--- + fs/ext4/hash.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/fs/ext4/hash.c b/fs/ext4/hash.c +index e22dcfab308b..46b24da33a28 100644 +--- a/fs/ext4/hash.c ++++ b/fs/ext4/hash.c +@@ -231,6 +231,7 @@ int ext4fs_dirhash(const char *name, int len, struct dx_hash_info *hinfo) + break; + case DX_HASH_HALF_MD4_UNSIGNED: + str2hashbuf = str2hashbuf_unsigned; ++ /* fall through */ + case DX_HASH_HALF_MD4: + p = name; + while (len > 0) { +@@ -244,6 +245,7 @@ int ext4fs_dirhash(const char *name, int len, struct dx_hash_info *hinfo) + break; + case DX_HASH_TEA_UNSIGNED: + str2hashbuf = str2hashbuf_unsigned; ++ /* fall through */ + case DX_HASH_TEA: + p = name; + while (len > 0) { +-- +2.19.2 + + diff --git a/series b/series index 5b92a10b..e2c129c7 100644 --- a/series +++ b/series @@ -16,6 +16,7 @@ fix-crash-during-online-resizing fix-race-while-writing-superblock fold-jbd2_superblock_csum_foo-into-their-callers dont-update-s_rev_level-if-not-required +annotate-implicit-fall-throughs #fix-slow-writeback-under-dioread_nolock-and-nodelalloc diff --git a/timestamps b/timestamps index 4ccaf515..240efb3e 100755 --- a/timestamps +++ b/timestamps @@ -31,7 +31,8 @@ touch -d @1549909832 fix-crash-during-online-resizing touch -d @1549934081 stable-boundary touch -d @1550179634 fix-race-while-writing-superblock touch -d @1550179694 fold-jbd2_superblock_csum_foo-into-their-callers -touch -d @1550180986 series touch -d @1550184738 dont-update-s_rev_level-if-not-required -touch -d @1550187341 status -touch -d @1550764121 timestamps +touch -d @1550764172 series +touch -d @1550764193 annotate-implicit-fall-throughs +touch -d @1550764232 status +touch -d @1550764238 timestamps -- 2.11.4.GIT