2019-01-14 20:40:21

by Mathieu Malaterre

[permalink] [raw]
Subject: [PATCH 1/2] ext4: annotate implicit fall throughs

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 <[email protected]>
---
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


2019-01-14 20:40:21

by Mathieu Malaterre

[permalink] [raw]
Subject: [PATCH 2/2] ext4: annotate implicit fall throughs

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/indirect.c:1182:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
fs/ext4/indirect.c:1188:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
fs/ext4/indirect.c:1432:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
fs/ext4/indirect.c:1440:6: warning: this statement may fall through [-Wimplicit-fallthrough=]

Signed-off-by: Mathieu Malaterre <[email protected]>
---
fs/ext4/indirect.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
index bf7fa1507e81..c2225f0d31b5 100644
--- a/fs/ext4/indirect.c
+++ b/fs/ext4/indirect.c
@@ -1183,18 +1183,21 @@ void ext4_ind_truncate(handle_t *handle, struct inode *inode)
ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 1);
i_data[EXT4_IND_BLOCK] = 0;
}
+ /* fall through */
case EXT4_IND_BLOCK:
nr = i_data[EXT4_DIND_BLOCK];
if (nr) {
ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 2);
i_data[EXT4_DIND_BLOCK] = 0;
}
+ /* fall through */
case EXT4_DIND_BLOCK:
nr = i_data[EXT4_TIND_BLOCK];
if (nr) {
ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 3);
i_data[EXT4_TIND_BLOCK] = 0;
}
+ /* fall through */
case EXT4_TIND_BLOCK:
;
}
@@ -1433,6 +1436,7 @@ int ext4_ind_remove_space(handle_t *handle, struct inode *inode,
ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 1);
i_data[EXT4_IND_BLOCK] = 0;
}
+ /* fall through */
case EXT4_IND_BLOCK:
if (++n >= n2)
return 0;
@@ -1441,6 +1445,7 @@ int ext4_ind_remove_space(handle_t *handle, struct inode *inode,
ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 2);
i_data[EXT4_DIND_BLOCK] = 0;
}
+ /* fall through */
case EXT4_DIND_BLOCK:
if (++n >= n2)
return 0;
@@ -1449,6 +1454,7 @@ int ext4_ind_remove_space(handle_t *handle, struct inode *inode,
ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 3);
i_data[EXT4_TIND_BLOCK] = 0;
}
+ /* fall through */
case EXT4_TIND_BLOCK:
;
}
--
2.19.2

2019-01-17 17:39:58

by Andreas Dilger

[permalink] [raw]
Subject: Re: [PATCH 2/2] ext4: annotate implicit fall throughs


> On Jan 14, 2019, at 1:39 PM, Mathieu Malaterre <[email protected]> wrote:
>
> 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/indirect.c:1182:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
> fs/ext4/indirect.c:1188:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
> fs/ext4/indirect.c:1432:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
> fs/ext4/indirect.c:1440:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
>
> Signed-off-by: Mathieu Malaterre <[email protected]>

Reviewed-by: Andreas Dilger <[email protected]>

> ---
> fs/ext4/indirect.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
> index bf7fa1507e81..c2225f0d31b5 100644
> --- a/fs/ext4/indirect.c
> +++ b/fs/ext4/indirect.c
> @@ -1183,18 +1183,21 @@ void ext4_ind_truncate(handle_t *handle, struct inode *inode)
> ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 1);
> i_data[EXT4_IND_BLOCK] = 0;
> }
> + /* fall through */
> case EXT4_IND_BLOCK:
> nr = i_data[EXT4_DIND_BLOCK];
> if (nr) {
> ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 2);
> i_data[EXT4_DIND_BLOCK] = 0;
> }
> + /* fall through */
> case EXT4_DIND_BLOCK:
> nr = i_data[EXT4_TIND_BLOCK];
> if (nr) {
> ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 3);
> i_data[EXT4_TIND_BLOCK] = 0;
> }
> + /* fall through */
> case EXT4_TIND_BLOCK:
> ;
> }
> @@ -1433,6 +1436,7 @@ int ext4_ind_remove_space(handle_t *handle, struct inode *inode,
> ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 1);
> i_data[EXT4_IND_BLOCK] = 0;
> }
> + /* fall through */
> case EXT4_IND_BLOCK:
> if (++n >= n2)
> return 0;
> @@ -1441,6 +1445,7 @@ int ext4_ind_remove_space(handle_t *handle, struct inode *inode,
> ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 2);
> i_data[EXT4_DIND_BLOCK] = 0;
> }
> + /* fall through */
> case EXT4_DIND_BLOCK:
> if (++n >= n2)
> return 0;
> @@ -1449,6 +1454,7 @@ int ext4_ind_remove_space(handle_t *handle, struct inode *inode,
> ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 3);
> i_data[EXT4_TIND_BLOCK] = 0;
> }
> + /* fall through */
> case EXT4_TIND_BLOCK:
> ;
> }
> --
> 2.19.2
>


Cheers, Andreas





Attachments:
signature.asc (873.00 B)
Message signed with OpenPGP

2019-01-17 17:39:18

by Andreas Dilger

[permalink] [raw]
Subject: Re: [PATCH 1/2] ext4: annotate implicit fall throughs


> On Jan 14, 2019, at 1:39 PM, Mathieu Malaterre <[email protected]> wrote:
>
> 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 <[email protected]>

Reviewed-by: Andreas Dilger <[email protected]>

> ---
> 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
>


Cheers, Andreas





Attachments:
signature.asc (873.00 B)
Message signed with OpenPGP

2019-02-21 15:50:16

by Theodore Ts'o

[permalink] [raw]
Subject: Re: [PATCH 1/2] ext4: annotate implicit fall throughs

On Mon, Jan 14, 2019 at 09:39:43PM +0100, Mathieu Malaterre wrote:
> 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 <[email protected]>

Thanks, applied.

- Ted

2019-02-21 15:52:32

by Theodore Ts'o

[permalink] [raw]
Subject: Re: [PATCH 2/2] ext4: annotate implicit fall throughs

On Mon, Jan 14, 2019 at 09:39:44PM +0100, Mathieu Malaterre wrote:
> 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/indirect.c:1182:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
> fs/ext4/indirect.c:1188:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
> fs/ext4/indirect.c:1432:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
> fs/ext4/indirect.c:1440:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
>
> Signed-off-by: Mathieu Malaterre <[email protected]>

Thanks, applied.

- Ted