net: ceph: mark expected switch fall-throughs
Subsystems (3)
PATCH 1/1 net: ceph: mark expected switch fall-throughs
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.
Signed-off-by Gustavo A. R. Silva <[email protected]>
--- net/ceph/ceph_hash.c | 12 +++++++++++- net/ceph/messenger.c | 1 + net/ceph/mon_client.c | 1 + 3 files changed, 13 insertions(+), 1 deletion(-)
net/ceph/ceph_hash.c +11 -1
@@ -47,28 +47,38 @@ unsigned int ceph_str_hash_rjenkins(const char *str, unsigned int length)/* handle the last 11 bytes */ c = c + length; -switch (len) {/* all the case statements fall through */ +switch (len) {case 11 : c = c + ((__u32 )k[10 ] <<24 ); +/* fall through */ case 10 : c = c + ((__u32 )k[9 ] <<16 ); +/* fall through */ case 9 : c = c + ((__u32 )k[8 ] <<8 );/* the first byte of c is reserved for the length */ +/* fall through */ case 8 : b = b + ((__u32 )k[7 ] <<24 ); +/* fall through */ case 7 : b = b + ((__u32 )k[6 ] <<16 ); +/* fall through */ case 6 : b = b + ((__u32 )k[5 ] <<8 ); +/* fall through */ case 5 : b = b + k[4 ]; +/* fall through */ case 4 : a = a + ((__u32 )k[3 ] <<24 ); +/* fall through */ case 3 : a = a + ((__u32 )k[2 ] <<16 ); +/* fall through */ case 2 : a = a + ((__u32 )k[1 ] <<8 ); +/* fall through */ case 1 : a = a + k[0 ];/* case 0: nothing left to add */
net/ceph/messenger.c +1 -0
@@ -429,6 +429,7 @@ static void ceph_sock_state_change(struct sock *sk)switch (sk->sk_state) {case TCP_CLOSE :dout ("%s TCP_CLOSE\n" , __func__); +/* fall through */ case TCP_CLOSE_WAIT :dout ("%s TCP_CLOSE_WAIT\n" , __func__);con_sock_state_closing (con);
net/ceph/mon_client.c +1 -0
@@ -1281,6 +1281,7 @@ static struct ceph_msg *mon_alloc_msg(struct ceph_connection *con,* request had a non-zero tid. Workaround this weirdness * by falling through to the allocate case. */ +/* fall through */ case CEPH_MSG_MON_MAP :case CEPH_MSG_MDS_MAP :case CEPH_MSG_OSD_MAP :
Signature · 1 line
2.7.4
Quoted 71 lines · Gustavo A. R. Silva
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.
Signed-off-by Gustavo A. R. Silva <[email protected]>--- net/ceph/ceph_hash.c | 12 +++++++++++- net/ceph/messenger.c | 1 + net/ceph/mon_client.c | 1 + 3 files changed, 13 insertions(+), 1 deletion(-)net/ceph/ceph_hash.c +11
-1@@ -47,28 +47,38 @@ unsigned int ceph_str_hash_rjenkins(const char *str, unsigned int length)/* handle the last 11 bytes */ c = c + length; -switch (len) {/* all the case statements fall through */ +switch (len) {case 11 : c = c + ((__u32 )k[10 ] <<24 ); +/* fall through */ case 10 : c = c + ((__u32 )k[9 ] <<16 ); +/* fall through */ case 9 : c = c + ((__u32 )k[8 ] <<8 );/* the first byte of c is reserved for the length */ +/* fall through */ case 8 : b = b + ((__u32 )k[7 ] <<24 ); +/* fall through */ case 7 : b = b + ((__u32 )k[6 ] <<16 ); +/* fall through */ case 6 : b = b + ((__u32 )k[5 ] <<8 ); +/* fall through */ case 5 : b = b + k[4 ]; +/* fall through */ case 4 : a = a + ((__u32 )k[3 ] <<24 ); +/* fall through */ case 3 : a = a + ((__u32 )k[2 ] <<16 ); +/* fall through */ case 2 : a = a + ((__u32 )k[1 ] <<8 ); +/* fall through */ case 1 : a = a + k[0 ];/* case 0: nothing left to add */ net/ceph/messenger.c +1
-0@@ -429,6 +429,7 @@ static void ceph_sock_state_change(struct sock *sk)switch (sk->sk_state) {case TCP_CLOSE :dout ("%s TCP_CLOSE\n" , __func__); +/* fall through */ case TCP_CLOSE_WAIT :dout ("%s TCP_CLOSE_WAIT\n" , __func__);con_sock_state_closing (con);net/ceph/mon_client.c +0
-0
net/ceph/mon_client.c static struct ceph_msg *mon_alloc_msg(struct ceph_connection *con, · line 1287
Quoted 7 lines
net/ceph/mon_client.c +1
-0@@ -1281,6 +1281,7 @@ static struct ceph_msg *mon_alloc_msg(struct ceph_connection *con,* request had a non-zero tid. Workaround this weirdness * by falling through to the allocate case. */ +/* fall through */ case CEPH_MSG_MON_MAP :case CEPH_MSG_MDS_MAP :case CEPH_MSG_OSD_MAP :
Applied.
Thanks,
Ilya