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 <garsilva@embeddedor.com>
[idryomov@gmail.com: amended "Older OSDs" comment]
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Gustavo A. R. Silva 2017-10-15 12:55:23 -05:00 committed by Ilya Dryomov
parent 76bd6ec498
commit 18370b36b2
3 changed files with 15 additions and 3 deletions

View File

@ -47,28 +47,38 @@ unsigned int ceph_str_hash_rjenkins(const char *str, unsigned int length)
/* handle the last 11 bytes */ /* handle the last 11 bytes */
c = c + length; c = c + length;
switch (len) { /* all the case statements fall through */ switch (len) {
case 11: case 11:
c = c + ((__u32)k[10] << 24); c = c + ((__u32)k[10] << 24);
/* fall through */
case 10: case 10:
c = c + ((__u32)k[9] << 16); c = c + ((__u32)k[9] << 16);
/* fall through */
case 9: case 9:
c = c + ((__u32)k[8] << 8); c = c + ((__u32)k[8] << 8);
/* the first byte of c is reserved for the length */ /* the first byte of c is reserved for the length */
/* fall through */
case 8: case 8:
b = b + ((__u32)k[7] << 24); b = b + ((__u32)k[7] << 24);
/* fall through */
case 7: case 7:
b = b + ((__u32)k[6] << 16); b = b + ((__u32)k[6] << 16);
/* fall through */
case 6: case 6:
b = b + ((__u32)k[5] << 8); b = b + ((__u32)k[5] << 8);
/* fall through */
case 5: case 5:
b = b + k[4]; b = b + k[4];
/* fall through */
case 4: case 4:
a = a + ((__u32)k[3] << 24); a = a + ((__u32)k[3] << 24);
/* fall through */
case 3: case 3:
a = a + ((__u32)k[2] << 16); a = a + ((__u32)k[2] << 16);
/* fall through */
case 2: case 2:
a = a + ((__u32)k[1] << 8); a = a + ((__u32)k[1] << 8);
/* fall through */
case 1: case 1:
a = a + k[0]; a = a + k[0];
/* case 0: nothing left to add */ /* case 0: nothing left to add */

View File

@ -430,6 +430,7 @@ static void ceph_sock_state_change(struct sock *sk)
switch (sk->sk_state) { switch (sk->sk_state) {
case TCP_CLOSE: case TCP_CLOSE:
dout("%s TCP_CLOSE\n", __func__); dout("%s TCP_CLOSE\n", __func__);
/* fall through */
case TCP_CLOSE_WAIT: case TCP_CLOSE_WAIT:
dout("%s TCP_CLOSE_WAIT\n", __func__); dout("%s TCP_CLOSE_WAIT\n", __func__);
con_sock_state_closing(con); con_sock_state_closing(con);

View File

@ -1279,9 +1279,10 @@ static struct ceph_msg *mon_alloc_msg(struct ceph_connection *con,
/* /*
* Older OSDs don't set reply tid even if the orignal * Older OSDs don't set reply tid even if the orignal
* request had a non-zero tid. Workaround this weirdness * request had a non-zero tid. Work around this weirdness
* by falling through to the allocate case. * by allocating a new message.
*/ */
/* fall through */
case CEPH_MSG_MON_MAP: case CEPH_MSG_MON_MAP:
case CEPH_MSG_MDS_MAP: case CEPH_MSG_MDS_MAP:
case CEPH_MSG_OSD_MAP: case CEPH_MSG_OSD_MAP: